Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For release 2024.09.00 #50

Merged
merged 215 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
215 commits
Select commit Hold shift + click to select a range
a26cb00
Updating setup.py to reflect version number
fmalatino Apr 18, 2024
4b7cb10
Merge pull request #37 from NOAA-GFDL/hotfix/version_num
FlorianDeconinck Apr 18, 2024
695c174
Update to `mypy` 1.4.1
FlorianDeconinck Apr 24, 2024
c52a719
Merge pull request #38 from NOAA-GFDL/update/mypy_1.4.1
fmalatino Apr 24, 2024
4f640ba
Update to DaCe fixing parsing issue when using python 3.11.x
fmalatino May 10, 2024
8056a22
Merge branch 'develop' into update/dace
fmalatino May 10, 2024
385860e
Basic boilerplate + utset
FlorianDeconinck May 14, 2024
50b8d82
lint
FlorianDeconinck May 14, 2024
2e20297
Add pytest-cov, configure
FlorianDeconinck May 14, 2024
637191d
lint
FlorianDeconinck May 14, 2024
e375e4e
Swap `pytest-cov` for raw usage of `coverage` which allows for better…
FlorianDeconinck May 14, 2024
77e19d0
lint
FlorianDeconinck May 14, 2024
c682381
Better source coverage
FlorianDeconinck May 14, 2024
352c04a
Updating submodules
fmalatino May 14, 2024
931e336
Updated quantity.py to use dsl type Float where needed
fmalatino May 15, 2024
c970914
Added use of 'Float' dsl type where needed in allocator.py
fmalatino May 15, 2024
6c86f0a
Updating gt4py and casting of float types to Float dsl type where nee…
fmalatino May 16, 2024
e7e4c95
Pull down pyFV3 & pySHiELD configuration that shouldn't be there.
FlorianDeconinck May 17, 2024
480a574
Add serialbox to netcdf as a tool of ndsl
FlorianDeconinck May 17, 2024
2bfdf47
Linting
FlorianDeconinck May 17, 2024
7474861
Rename --layout to --topology
FlorianDeconinck May 17, 2024
1b3e415
lint
FlorianDeconinck May 17, 2024
b168c94
Updating gt4py
fmalatino May 18, 2024
1a938f2
Testing for pyFV3
fmalatino May 18, 2024
0f8906b
Adjust naming & verbose choice for private generic function
FlorianDeconinck May 20, 2024
0789fc0
Lint
FlorianDeconinck May 20, 2024
2339beb
Merge pull request #40 from NOAA-GFDL/feature/pytest_code_coverage
FlorianDeconinck May 20, 2024
95a340f
Merge branch 'develop' into feature/boilerplate
FlorianDeconinck May 20, 2024
e30bd6b
Merge pull request #39 from NOAA-GFDL/feature/boilerplate
fmalatino May 20, 2024
8bfa5e1
Updated gt4py to latest version
fmalatino May 20, 2024
3a86077
Merge branch 'develop' into update/dace
fmalatino May 20, 2024
3fc8153
Merge branch 'develop' into fix/float_precision
fmalatino May 20, 2024
b87f813
Updated setup.py to reflect actual version number
fmalatino May 20, 2024
f47b2b9
Updating gt4py
fmalatino May 21, 2024
ee169e2
Merge branch 'develop' into update/dace
fmalatino May 21, 2024
12cf113
Merge pull request #43 from fmalatino/update/dace
fmalatino May 21, 2024
b610acc
Merge branch 'develop' into fix/float_precision
fmalatino May 21, 2024
2aef448
Removed commented Float import in ndsl/quantity.py
fmalatino May 30, 2024
1617e9f
Readding tutorial notebooks based off NDSL develop branch
gmao-ckung May 31, 2024
69dee7e
Removed comment in quantity regarding pace issue 3
fmalatino May 31, 2024
2b26863
Merge branch 'develop' into feature/centralize_translate_test
FlorianDeconinck May 31, 2024
495953d
Merge pull request #45 from NOAA-GFDL/feature/centralize_translate_test
FlorianDeconinck May 31, 2024
360c316
Added Fortran serialization notebooks
gmao-ckung Jun 3, 2024
585519b
Merge branch 'develop' into fix/float_precision for PR 45 changes
fmalatino Jun 3, 2024
30e0907
Local linting
gmao-ckung Jun 3, 2024
0f8867b
Merge branch 'develop' into feature/NDSL_tutorial
FlorianDeconinck Jun 3, 2024
fa6e7e8
Merge pull request #48 from NOAA-GFDL/feature/NDSL_tutorial
fmalatino Jun 3, 2024
afb5f34
Merge branch 'develop' into fix/float_precision with changes from PR 48
fmalatino Jun 3, 2024
c3afec1
Merge pull request #44 from fmalatino/fix/float_precision
fmalatino Jun 3, 2024
a601d05
Updated version to 2024.06.00
fmalatino Jun 3, 2024
56b3f9d
Merge pull request #49 from fmalatino/develop
fmalatino Jun 4, 2024
3d0c7ad
try test
Jun 5, 2024
3803a5b
conda init
Jun 5, 2024
45dace2
conda init
Jun 5, 2024
20bae61
echo y
Jun 5, 2024
bee9222
source
Jun 5, 2024
d0ff431
.
Jun 5, 2024
6881340
bash
Jun 5, 2024
d461ea1
.
Jun 5, 2024
a4ff3c1
try again
Jun 5, 2024
770b465
s
Jun 5, 2024
532d737
test
Jun 5, 2024
31cb3fd
update
Jun 5, 2024
b5d5694
mpiexec
Jun 5, 2024
eee00a4
remove extra space
Jun 5, 2024
ef72550
more fixes
Jun 5, 2024
047bb6a
separate build
Jun 6, 2024
3239abd
add untracked file
Jun 6, 2024
4164b28
update to develop
Jun 6, 2024
bffe029
Merge remote-tracking branch 'mkl/ci-testing_test' into ci-testing
Jun 6, 2024
c9d2379
remove push
Jun 6, 2024
c9fb6e6
concurrency
Jun 6, 2024
712045d
submodule woes
Jun 6, 2024
e19c1d8
test parallel
Jun 6, 2024
fea603b
undo separate build
Jun 6, 2024
e7a0adb
will this work
Jun 6, 2024
164120b
Changed conditional statement to check for compute option in test_tra…
fmalatino Jun 7, 2024
a8e58e6
Linting
fmalatino Jun 7, 2024
170e47a
Updating submodules
fmalatino Jun 7, 2024
94b1079
Updating dace
fmalatino Jun 11, 2024
777aab4
trigger ci
Jun 11, 2024
6999653
Changed get_communicator conditional to check for cubed-sphere
fmalatino Jun 11, 2024
4e56cca
attempt 1
Jun 12, 2024
e2bd82f
Changed get_communicator topology selection conditional
fmalatino Jun 12, 2024
50c8bc7
Changed mysign in fill_corners_dgrid_def to external variable
fmalatino Jun 12, 2024
7db441a
Linting
fmalatino Jun 12, 2024
ad6c500
Rolling back dace and gt4py
fmalatino Jun 13, 2024
2a5c9f4
Removing mysign from axis_offsets
fmalatino Jun 13, 2024
ee2b2c8
Cast parameters in Translate test to proper float precision
FlorianDeconinck Jun 13, 2024
6580f0f
Merge pull request #55 from NOAA-GFDL/fix/missing_Float_cast_translat…
FlorianDeconinck Jun 13, 2024
2284554
test
Jun 13, 2024
889b99d
test
Jun 13, 2024
6ee554b
test
Jun 13, 2024
2eaa637
test
Jun 13, 2024
5cf9bca
test
Jun 13, 2024
ccbb873
test
Jun 13, 2024
ba05f2c
Update fv3_tests.yaml
mlee03 Jun 13, 2024
1efe582
Update fv3_tests.yaml
mlee03 Jun 13, 2024
54416c5
Update fv3_tests.yaml
mlee03 Jun 13, 2024
59630da
Update fv3_tests.yaml
mlee03 Jun 13, 2024
56fbc8b
test
Jun 13, 2024
f5a812b
test
Jun 13, 2024
49ad630
trigger fv3 workflow
Jun 13, 2024
ba5d216
remove push
Jun 13, 2024
63a2bb4
lint
Jun 13, 2024
d65eed5
test
Jun 13, 2024
0c95e25
When building a default Grid, do not pass adjusted npx/npy
FlorianDeconinck Jun 14, 2024
a37f641
Merge pull request #56 from NOAA-GFDL/fix/bad_grid_dim_on_default
FlorianDeconinck Jun 14, 2024
67b2a2a
fix action name
Jun 20, 2024
7e0d08c
UNTRACKED FILE
Jun 20, 2024
fc21a7d
Merge branch 'develop' into fix/computegridoption
fmalatino Jun 20, 2024
921de90
Merge pull request #53 from fmalatino/fix/computegridoption
fmalatino Jun 20, 2024
5342b11
Merge branch 'main' into develop
fmalatino Jun 20, 2024
6481be5
Pinning numpy version in setup.py
fmalatino Jun 20, 2024
e274d64
Removed python 3.8.12 from testing matrix
fmalatino Jun 20, 2024
93ff0dc
Merge branch 'develop' into ci-testing
fmalatino Jun 20, 2024
787c70a
Updating lint workflow to use python 3.11.7
fmalatino Jun 20, 2024
da2d5ee
Changed action/checkout to version 4
fmalatino Jun 20, 2024
ee8aa85
Re-pinning numpy
fmalatino Jun 20, 2024
b21263e
Looking at pip list
fmalatino Jun 20, 2024
4526031
Pinned other requirements
fmalatino Jun 20, 2024
5cc229f
Only pinning what needs to be pinned
fmalatino Jun 20, 2024
7c5326d
Removing call to pip list from unit_tests.yaml
fmalatino Jun 21, 2024
d6f39c1
Merge pull request #57 from fmalatino/fix/numpy
fmalatino Jun 21, 2024
0bfba1c
add shield trigger
Jun 21, 2024
7bcc65e
crrect trigger
Jun 21, 2024
d39cca9
add pace tests
Jun 23, 2024
77e0f9a
test
Jun 23, 2024
89904e1
uniformity
Jun 23, 2024
e77346d
fix file
Jun 23, 2024
6b897e0
test
Jun 23, 2024
cb5581e
fix
Jun 23, 2024
3b1de9c
test
Jun 23, 2024
bc7f40a
change name
Jun 23, 2024
f25c138
Merge remote-tracking branch 'mkl/reusing_workflows' into ci-testing
Jun 24, 2024
75ea6f2
reusable workflows
Jun 24, 2024
703af3c
Merge remote-tracking branch 'mkl/ci-testing' into ci-testing
Jun 24, 2024
a1040a1
Merge remote-tracking branch 'origin/develop' into ci-testing
Jun 27, 2024
118b029
Reverting changes to use of mysign in corners.py
fmalatino Jun 28, 2024
9afe641
Merge pull request #59 from fmalatino/fix/mysign
fmalatino Jun 28, 2024
def2191
test
Jul 1, 2024
b7727da
test
Jul 2, 2024
cf4c36d
update tests
Jul 2, 2024
24b8675
update lint
Jul 2, 2024
cbe983d
Merge pull request #51 from mlee03/ci-testing
fmalatino Jul 11, 2024
a5c8086
fix the mysign symbol bug in python 3.11
Jul 30, 2024
5184be8
Make sure the netCDF reflects the Fortran type as saved
FlorianDeconinck Jul 31, 2024
62c8069
Merge pull request #61 from FlorianDeconinck/fix/serialbox_to_netcdf
FlorianDeconinck Aug 1, 2024
979c965
Attempt to quantify noise (non-binding)
FlorianDeconinck Aug 1, 2024
3b73345
Merge pull request #60 from xyuan/xyuan/fix
fmalatino Aug 1, 2024
3b7420e
Fix typo in print statement (FORWARD example)
Aug 2, 2024
7679ff0
Merge pull request #62 from NOAA-GFDL/fix/typo-in-gt4py-basic-example
FlorianDeconinck Aug 5, 2024
ffd0429
NDSL examples: clear output from notebooks
Aug 6, 2024
727503e
Fix typos in boilerplate doc strings
Aug 6, 2024
8c6b4e0
Improved NDSL examples
Aug 5, 2024
7fda6d4
Move plotting (at level k) to quantity class
Aug 6, 2024
24b4a3f
Remove executable flag on GT4Py example notebook
Aug 6, 2024
6fc7158
Better error when missing data from the netCDF
FlorianDeconinck Aug 6, 2024
4b16dd4
Merge pull request #63 from romanc/feature/better-docs-for-ndsl-examples
FlorianDeconinck Aug 7, 2024
1bda968
Added conditional to MetricTerms init to allow for metric term genera…
fmalatino Aug 20, 2024
d0c1703
Support for pbl scheme (#66)
oelbert Aug 21, 2024
b18880b
Changes to support testing in pace for eta file specification
fmalatino Aug 22, 2024
104076f
Merge branch 'develop' into feature/no_eta
fmalatino Aug 22, 2024
5ce87f1
Multi modal float metric (see comparison.py)
FlorianDeconinck Aug 23, 2024
59a529c
Clamp f32 to 1e-10
FlorianDeconinck Aug 27, 2024
ba28f33
Moved test_eta.py from pace/tests/main/grid into NDSL/tests/grid, add…
fmalatino Aug 27, 2024
20ed73d
Merge branch 'feature/no_eta' of github.com:fmalatino/NDSL into featu…
fmalatino Aug 27, 2024
9cafe2e
Amending unit_tests.yaml to reflect addition of tests/grid/test_eta.py
fmalatino Aug 27, 2024
3f80b64
Merge branch 'develop' into feature/translate_test_f32
FlorianDeconinck Aug 27, 2024
9cb8f14
Amending file path for test_eta.py
fmalatino Aug 27, 2024
a0c4992
Another attempt to get the workflow to generate the test eta_files
fmalatino Aug 27, 2024
10942b2
Linting
fmalatino Aug 27, 2024
775e932
Fix compare_to_numpy use of metric
Aug 28, 2024
25fe597
Fix success message
Aug 28, 2024
0edcf73
adding block merging to netcdf conversion
oelbert Aug 28, 2024
712a385
Use of f-string in ValueError statement of _load_ak_bk_from_file
fmalatino Aug 29, 2024
37872f0
Amending pytest.fail statement in test_eta.py
fmalatino Aug 29, 2024
82df229
bigfix
oelbert Aug 29, 2024
c76a486
Amended generation.py to define hybrid pressure variables appropriately
fmalatino Aug 30, 2024
50a1f93
bug
oelbert Aug 30, 2024
50607ca
uninspiring revelation
oelbert Aug 30, 2024
24ddc5d
lint
oelbert Sep 3, 2024
51ede30
Merge branch 'feature/merge_savepoints' of github.com:oelbert/NDSL in…
oelbert Sep 3, 2024
6588154
removing dead code
oelbert Sep 3, 2024
cb4ce98
revert externals
oelbert Sep 3, 2024
82e5384
Merge pull request #68 from oelbert/feature/merge_savepoints
FlorianDeconinck Sep 3, 2024
a2bf01d
Merge branch 'develop' into feature/translate_test_f32
FlorianDeconinck Sep 3, 2024
5ff184c
Move all thresholds to class variable
Sep 4, 2024
47396f8
Merge remote-tracking branch 'NOAA/feature/translate_test_f32' into f…
Sep 4, 2024
7f84b32
Merge pull request #67 from NOAA-GFDL/feature/translate_test_f32
FlorianDeconinck Sep 4, 2024
99f1e43
Non-ideal fix for unreachable scalar variables, specifically in stenc…
fmalatino Sep 4, 2024
1082b62
Amended test_eta.py docstrings to reflect updated testing methods and…
fmalatino Sep 5, 2024
8a236a7
Merge branch 'develop' into feature/no_eta
fmalatino Sep 5, 2024
e3cca7c
Amended method fill_corners_dgrid_defn to use x_out = x_out instead o…
fmalatino Sep 5, 2024
57f1807
fix compute 0 errors
oelbert Sep 5, 2024
1bd19ea
oops
oelbert Sep 5, 2024
a427b1a
found the culprit
oelbert Sep 5, 2024
4bf1dbd
Merge pull request #74 from oelbert/hotfix/legacy_metric
FlorianDeconinck Sep 6, 2024
71bcb56
Merge branch 'develop' into feature/no_eta
fmalatino Sep 6, 2024
3649691
Linting
fmalatino Sep 6, 2024
7e1a16d
Merge branch 'develop' into fix/x_in_x_out
FlorianDeconinck Sep 9, 2024
1773365
Merge pull request #69 from fmalatino/fix/x_in_x_out
FlorianDeconinck Sep 9, 2024
85ebd24
hotfix to handle bool in serialized test data
oelbert Sep 9, 2024
4ff66a9
Merge pull request #75 from oelbert/hotfix/bool_test
fmalatino Sep 9, 2024
1102b75
Merge branch 'develop' into feature/no_eta
fmalatino Sep 12, 2024
1318b56
Amended generation.py to set default eta_file to None
fmalatino Sep 12, 2024
49ebd43
Merged most recent changes of NDSL as of 12 Sept 2024
fmalatino Sep 12, 2024
a1010dd
Changed type hinting of eta_file in generation.py to reflect optional…
fmalatino Sep 12, 2024
b87b0cb
Updates to submodules and version number
fmalatino Sep 13, 2024
3a9852c
Merge branch 'develop' into update/subrepos
fmalatino Sep 13, 2024
c355e85
Merge pull request #76 from fmalatino/update/subrepos
fmalatino Sep 13, 2024
069f056
Merge branch 'develop' into feature/no_eta
fmalatino Sep 16, 2024
4a4c0c8
Merge pull request #65 from fmalatino/feature/no_eta
fmalatino Sep 16, 2024
8a719ef
Translate: print only ~10 errors and dump all data in files under `.t…
Sep 26, 2024
a667d29
Merge pull request #77 from FlorianDeconinck/qol/translate_report
FlorianDeconinck Sep 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/fv3_translate_tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: "FV3 translate tests"
on:
pull_request:

jobs:
fv3_translate_tests:
uses: NOAA-GFDL/pyFV3/.github/workflows/translate.yaml@develop
with:
component_trigger: true
component_name: NDSL
8 changes: 6 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
name: "Lint"
on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]

# cancel running jobs if theres a newer push
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
lint:
Expand All @@ -14,7 +18,7 @@ jobs:
- name: Step Python
uses: actions/[email protected]
with:
python-version: '3.8.12'
python-version: '3.11.7'
- name: Install OpenMPI for gt4py
run: |
sudo apt-get install libopenmpi-dev
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/pace_tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: "pace main tests"
on:
pull_request:

jobs:
pace_main_tests:
uses: NOAA-GFDL/pace/.github/workflows/main_unit_tests.yaml@develop
with:
component_trigger: true
component_name: NDSL
10 changes: 10 additions & 0 deletions .github/workflows/shield_tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: "SHiELD Translate tests"
on:
pull_request:

jobs:
shield_translate_tests:
uses: NOAA-GFDL/pySHiELD/.github/workflows/translate.yaml@develop
with:
component_trigger: true
component_name: NDSL
43 changes: 24 additions & 19 deletions .github/workflows/unit_tests.yaml
Original file line number Diff line number Diff line change
@@ -1,33 +1,38 @@
name: "Unit tests"
name: "NDSL unit tests"
on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]

# cancel running jobs if theres a newer push
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
all:
ndsl_unit_tests:
runs-on: ubuntu-latest
strategy:
matrix:
python: [3.8.12, 3.11.7]
container:
image: ghcr.io/noaa-gfdl/miniforge:mpich
steps:

- name: Checkout repository
uses: actions/checkout@v3.5.2
uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Setup Python
uses: actions/[email protected]
with:
python-version: ${{ matrix.python }}
- name: Install OpenMPI & Boost for gt4py
run: |
sudo apt-get install libopenmpi-dev libboost1.74-dev

- name: Install Python packages
run: pip3 install .[test]

- name: prepare input eta files
run: |
python -m pip install --upgrade pip setuptools wheel
pip install .[test]
python tests/grid/generate_eta_files.py

- name: Run serial-cpu tests
run: |
pytest -x tests
run: coverage run --rcfile=setup.cfg -m pytest -x tests

- name: Run parallel-cpu tests
run: mpiexec -np 6 --oversubscribe coverage run --rcfile=setup.cfg -m mpi4py -m pytest -x tests/mpi

- name: Output code coverage
run: |
mpirun -np 6 --oversubscribe pytest -x tests/mpi
coverage combine
coverage report
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ repos:
args: ["--profile", "black"]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.812
rev: v1.4.1
hooks:
- id: mypy
name: mypy-ndsl
args: [--config-file, setup.cfg]
additional_dependencies: [types-PyYAML]
files: ndsl
exclude: |
(?x)^(
Expand Down
Loading
Loading