fix #351: Solution 1: enforce weights.shape = x.shape for tuple axis #953

Mystic-Slice · 2022-04-03T06:22:49Z

Issue/s resolved: #351

Type of change

Documentation update

Due Diligence

All split configurations tested
Multiple dtypes tested in relevant functions
Documentation updated (if needed)
Updated changelog.md under the title "Pending Additions"

Does this change modify the behaviour of other functions? If so, which?

yes / no

skip ci

…ape for tuple axis

mtar · 2022-04-03T06:22:52Z

GPU cluster tests are currently disabled on this Pull Request.

ghost · 2022-04-03T06:23:54Z

👇 Click on the image for a new way to code review

Make big changes easier — review code in small groups of related files
Know where to start — see the whole change at a glance
Take a code tour — explore the change with an interactive tour
Make comments and review — all fully sync’ed with github

Try it now!

Legend

ClaudiaComito

@Mystic-Slice thanks a lot for taking this on and welcome to our legacy code 😬

I vaguely remember implementing ht.average, it seems so overly complicated now.

I agree with your solution 1, we can enforce - just like numpy - that weights.shape == a.shape if averaging along more than one axis. They must be distributed along the same split axis as well.

The distributed operation itself can be simplified quite a bit, as it's just:

(a*weights).sum(axis)/weights.sum(axis)

a*weights calls _operations.__binary_op() and ht.sum() calls _operations.__reduce_op(), those will take care of sanitizing, communication when needed, etc.

Please go ahead and make the changes whenever you feel comfortable. Thanks a lot!

Mystic-Slice · 2022-04-30T01:01:12Z

Hey @ClaudiaComito!
Sorry for the late reply!
I think the changes that you requested are already present in the code.
See lines 286 - 299

* wip: Initial release draft and changelog updater actions configuration * doc: pr title style guide in contibuting.md * ci: improved release draft templates * ci: extra release draft categories * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: Claudia Comito <39374113+ClaudiaComito@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* doc: parallel tutorial note metioning local and global printing * doc: extenden local print note with ``ht.local_printing()`` * Fix typo * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: Claudia Comito <39374113+ClaudiaComito@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Updated the tutorial document. 1. Corrected the spelling mistake -> (sigular to single) 2. Corrected the statement -> the number of dimensions is the rank of the array. 3. Made 2 more small changes. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix typo Co-authored-by: Claudia Comito <39374113+ClaudiaComito@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

updates: - [github.com/psf/black: 22.3.0 → 22.6.0](psf/black@22.3.0...22.6.0)

…eatures/994-linspace-zero-samples Non-negative sample size for `linspace`/`logspace`

…ug/996-iinfo-finfo-min Bug/996 `iinfo`/`finfo` `min` value

…re-commit-ci-update-config [pre-commit.ci] pre-commit autoupdate

…alytics#1014) * Test latest pyorch on both main and release branch * Move pytorch release record out of workflows directory * Update paths * New PyTorch release * Temporarily remove trigger * Update pytorch-latest.txt * Reinstate trigger * New PyTorch release * Remove matrix strategy * Update pytorch-latest.txt * New PyTorch release * New PyTorch release * fix: set cuda rng state on gpu tests for test_random.py * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Added tests for python 3.9 and pytorch 1.12 Co-authored-by: Claudia Comito <c.comito@fz-juelich.de> Co-authored-by: Daniel Coquelin <daniel.coquelin@gmail.com> Co-authored-by: ClaudiaComito <c.comito@fz-juelich.de@users.noreply.github.com> Co-authored-by: Claudia Comito <39374113+ClaudiaComito@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

updates: - [github.com/psf/black: 22.6.0 → 22.8.0](psf/black@22.6.0...22.8.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Claudia Comito <39374113+ClaudiaComito@users.noreply.github.com>

fixes formatting issues

fixes an issue where the bug label is not set.

Use status badge from a different workflow action

* Check for split in `__reduce_op` * Check whether x is distributed Co-authored-by: mtar <m.tarnawa@fz-juelich.de> Co-authored-by: mtar <m.tarnawa@fz-juelich.de> Co-authored-by: Claudia Comito <39374113+ClaudiaComito@users.noreply.github.com>

* Update ci worflow action * Update codecov.yml

* Fix `all` * Fix `any` * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Add distributed tests * Expanded tests for combination of axis/split axis Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Claudia Comito <39374113+ClaudiaComito@users.noreply.github.com> Co-authored-by: mtar <m.tarnawa@fz-juelich.de>

updates: - [github.com/psf/black: 22.8.0 → 22.10.0](psf/black@22.8.0...22.10.0)

…pre-commit-ci-update-config [pre-commit.ci] pre-commit autoupdate

Mystic-Slice · 2022-10-22T00:59:37Z

Changes moved to a new branch. See, #1037

fix helmholtz-analytics#351: Solution 1: enforce weights.shape = x.sh…

240bc05

…ape for tuple axis

Mystic-Slice mentioned this pull request Apr 3, 2022

ht.average() should allow weighted average across multiple axes #351

Closed

Merge branch 'main' into RestrictWeightShape

116b9cb

ClaudiaComito requested changes Apr 25, 2022

View reviewed changes

Merge branch 'release/1.2.x', set main version extension to "dev"

885f686

ClaudiaComito changed the base branch from main to release/1.2.x April 27, 2022 13:20

ClaudiaComito and others added 10 commits May 26, 2022 08:43

Update link to llnl MPI tutorial and merge branch 'release/1.2.x'

e30d739

Replace bug report MD template with form in view of further automation

08d0dcb

Fix bug report file name

545a694

Update bug_report.yml

295351c

Update bug_report.yml

91f8190

Update bug_report.yml

ef94a9b

Update bug_report.yml

4a1fc1a

ClaudiaComito added the PR talk label Jun 13, 2022

ClaudiaComito and others added 4 commits July 2, 2022 06:19

Set write permissions for workflow

ee0ff4d

Update schedule

a1f0b1b

Update schedule

96506fa

Update schedule

385374a

ClaudiaComito removed the PR talk label Jul 4, 2022

ClaudiaComito and others added 5 commits July 4, 2022 14:35

Move pytorch version file out of workflows dir

bff6b2c

Update paths

4f59d69

[pre-commit.ci] pre-commit autoupdate

55fff46

updates: - [github.com/psf/black: 22.3.0 → 22.6.0](psf/black@22.3.0...22.6.0)

Push pytorch release update to release/1.2.x branch, not main

4fe322b

Update schedule

a52156b

neosunhan and others added 14 commits July 15, 2022 14:36

Enable non-negative sample size

d39cbfe

Read min value directly from torch return object

105b905

Enable non-negative number of samples for logspace

54ab969

Add test for logspace

2dfd591

Merge pull request helmholtz-analytics#995 from helmholtz-analytics/f…

99aef73

…eatures/994-linspace-zero-samples Non-negative sample size for `linspace`/`logspace`

Merge branch 'main' into bug/996-iinfo-finfo-min

92e64c4

Merge pull request helmholtz-analytics#997 from helmholtz-analytics/b…

891a983

…ug/996-iinfo-finfo-min Bug/996 `iinfo`/`finfo` `min` value

Merge branch 'main' into pre-commit-ci-update-config

7ca100d

Merge pull request helmholtz-analytics#984 from helmholtz-analytics/p…

15240b0

…re-commit-ci-update-config [pre-commit.ci] pre-commit autoupdate

Add MPI version field to bug report template

c85562b

Merge release/1.2.x into main

e56e6ec

rename file and activate force push

5ff0314

ClaudiaComito added the GSoC label Sep 26, 2022

mtar and others added 13 commits September 27, 2022 15:07

Update bug_report.yml

bd16040

fixes formatting issues

Update bug_report.yml

ba1225a

fixes an issue where the bug label is not set.

Update README.md

9e4882a

Use status badge from a different workflow action

Update codecov.yml

439d542

Update codecov.yml

0949a48

Add section Google Summer of Code 2022

398ac0d

Add section "Array API"

db44c93

Mirror Repository and run GitHub CI at HZDR (helmholtz-analytics#1032)

d5c14b7

* Update ci worflow action * Update codecov.yml

[pre-commit.ci] pre-commit autoupdate

5ba9b32

updates: - [github.com/psf/black: 22.8.0 → 22.10.0](psf/black@22.8.0...22.10.0)

Merge pull request helmholtz-analytics#1033 from helmholtz-analytics/…

ae9dd50

…pre-commit-ci-update-config [pre-commit.ci] pre-commit autoupdate

Merge branch 'helmholtz-analytics:main' into RestrictWeightShape

2c5c7be

Mystic-Slice closed this Oct 22, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix #351: Solution 1: enforce weights.shape = x.shape for tuple axis #953

fix #351: Solution 1: enforce weights.shape = x.shape for tuple axis #953

Mystic-Slice commented Apr 3, 2022 •

edited

Loading

mtar commented Apr 3, 2022

ghost commented Apr 3, 2022 •

edited by ghost

Loading

ClaudiaComito left a comment

Mystic-Slice commented Apr 30, 2022 •

edited

Loading

Mystic-Slice commented Oct 22, 2022

fix #351: Solution 1: enforce weights.shape = x.shape for tuple axis #953

fix #351: Solution 1: enforce weights.shape = x.shape for tuple axis #953

Conversation

Mystic-Slice commented Apr 3, 2022 • edited Loading

Type of change

Due Diligence

Does this change modify the behaviour of other functions? If so, which?

mtar commented Apr 3, 2022

ghost commented Apr 3, 2022 • edited by ghost Loading

Legend

ClaudiaComito left a comment

Choose a reason for hiding this comment

Mystic-Slice commented Apr 30, 2022 • edited Loading

Mystic-Slice commented Oct 22, 2022

Mystic-Slice commented Apr 3, 2022 •

edited

Loading

ghost commented Apr 3, 2022 •

edited by ghost

Loading

Mystic-Slice commented Apr 30, 2022 •

edited

Loading