From e640949dbbda087fdd7c11406cd0c2323c486d10 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 19 Jul 2024 10:48:48 -0700 Subject: [PATCH 01/11] require ip version 5.1.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bed756a..f981b162 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,7 @@ endif() # If user wants to use NCEPLIBS-ip, find it and the sp library. message(STATUS "Checking if the user want to use NCEPLIBS-ip...") if(USE_IPOLATES) - find_package(ip CONFIG REQUIRED) + find_package(ip 5.1.0 CONFIG REQUIRED) list(APPEND definitions_list -DIPOLATES_LIB="ipolates_lib_d") list(APPEND definitions_list -DUSE_IPOLATES) endif() From 35dcec03f786ee376fd5bde47bc00a582797e75e Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 19 Jul 2024 11:02:03 -0700 Subject: [PATCH 02/11] turn use_ipolates off by default --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f981b162..949a0fb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ option(USE_HDF5 "Use HDF5?" off) option(USE_REGEX "Use Regex?" on) option(USE_TIGGE "Use tigge?" on) option(USE_MYSQL "Use MySQL?" off) -option(USE_IPOLATES "Use Ipolates" on) +option(USE_IPOLATES "Use Ipolates" off) option(USE_UDF "Use UDF?" off) option(USE_OPENMP "Use OpenMP?" on) option(USE_PROJ4 "Use Proj4?" off) From 797d39c0edfd4f400616ee8fab5aa49cb4706541 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 19 Jul 2024 11:28:39 -0700 Subject: [PATCH 03/11] ip library checked out and built twice in developer workflow --- .github/workflows/developer.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 1bddfd9a..ebe810e6 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -73,22 +73,6 @@ jobs: make -j2 make install - - name: checkout-ip - uses: actions/checkout@v4 - with: - repository: NOAA-EMC/NCEPLIBS-ip - path: ip - ref: v3.3.3 - - - name: build-ip - run: | - cd ip - mkdir build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=~/ip -DCMAKE_PREFIX_PATH=~/sp - make -j2 - make install - - name: checkout-ip2 uses: actions/checkout@v4 with: From 85183d9363e8f8306036f968735434ec2d91eb1b Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 19 Jul 2024 12:24:50 -0700 Subject: [PATCH 04/11] Update package.py --- spack/package.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spack/package.py b/spack/package.py index 19975637..683d05a8 100644 --- a/spack/package.py +++ b/spack/package.py @@ -89,6 +89,13 @@ def url_for_version(self, version): default="3", description="Use to interpolate to new grids (0 = OFF, 1 = ip, 3 = ip2)", values=("0", "1", "3"), + when="@:3.2" + ) + variant( + "ipolates", + default=False, + description="Use ipolates library", + when="@3.3:" ) variant( "spectral", default=False, description="Spectral interpolation in -new_grid", when="@:3.1" @@ -153,7 +160,7 @@ def url_for_version(self, version): depends_on("wget", type=("build"), when="@:3.1 +netcdf4") depends_on("ip@:3", when="@3.2 ipolates=1") depends_on("ip2", when="@3.2 ipolates=3") - depends_on("ip@4.1:", when="@develop ipolates=1") + depends_on("ip@5.1:", when="@develop +ipolates") depends_on("libaec@1.0.6:", when="@3.2: +aec") depends_on("netcdf-c", when="@3.2: +netcdf4") depends_on("jasper@:2", when="@3.2: +jasper") From f9a886f6bf6124a309312467f513fad18a37e9df Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 19 Jul 2024 12:34:03 -0700 Subject: [PATCH 05/11] debugging --- spack/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack/package.py b/spack/package.py index 683d05a8..7b56e482 100644 --- a/spack/package.py +++ b/spack/package.py @@ -160,7 +160,7 @@ def url_for_version(self, version): depends_on("wget", type=("build"), when="@:3.1 +netcdf4") depends_on("ip@:3", when="@3.2 ipolates=1") depends_on("ip2", when="@3.2 ipolates=3") - depends_on("ip@5.1:", when="@develop +ipolates") + depends_on("ip@5.1:", when="@develop ipolates=1") depends_on("libaec@1.0.6:", when="@3.2: +aec") depends_on("netcdf-c", when="@3.2: +netcdf4") depends_on("jasper@:2", when="@3.2: +jasper") From 3ed98ca8b24d59e932c0b6cf047017d701913698 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 19 Jul 2024 12:38:03 -0700 Subject: [PATCH 06/11] more debugging --- spack/package.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spack/package.py b/spack/package.py index 7b56e482..3c9ab9a0 100644 --- a/spack/package.py +++ b/spack/package.py @@ -89,14 +89,14 @@ def url_for_version(self, version): default="3", description="Use to interpolate to new grids (0 = OFF, 1 = ip, 3 = ip2)", values=("0", "1", "3"), - when="@:3.2" - ) - variant( - "ipolates", - default=False, - description="Use ipolates library", - when="@3.3:" + #when="@:3.2" ) + #variant( + # "ipolates", + # default=False, + # description="Use ipolates library", + # when="@3.3:" + #) variant( "spectral", default=False, description="Spectral interpolation in -new_grid", when="@:3.1" ) From 6c6a62b60b54f7d908dfcf59d948201000588fea Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 19 Jul 2024 12:45:11 -0700 Subject: [PATCH 07/11] Update package.py --- spack/package.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/spack/package.py b/spack/package.py index 3c9ab9a0..3c6826f0 100644 --- a/spack/package.py +++ b/spack/package.py @@ -89,14 +89,7 @@ def url_for_version(self, version): default="3", description="Use to interpolate to new grids (0 = OFF, 1 = ip, 3 = ip2)", values=("0", "1", "3"), - #when="@:3.2" ) - #variant( - # "ipolates", - # default=False, - # description="Use ipolates library", - # when="@3.3:" - #) variant( "spectral", default=False, description="Spectral interpolation in -new_grid", when="@:3.1" ) From f85e6889a493cffaadceef20275bdf154c02c0a4 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Fri, 19 Jul 2024 12:46:16 -0700 Subject: [PATCH 08/11] update ipolates default in package.py --- spack/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack/package.py b/spack/package.py index 3c6826f0..8c05620c 100644 --- a/spack/package.py +++ b/spack/package.py @@ -86,7 +86,7 @@ def url_for_version(self, version): ) variant( "ipolates", - default="3", + default="0", description="Use to interpolate to new grids (0 = OFF, 1 = ip, 3 = ip2)", values=("0", "1", "3"), ) From be8ec017fa7863b35ec0c8bf92fb656833367ef2 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:26:49 -0700 Subject: [PATCH 09/11] Update package.py --- spack/package.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/spack/package.py b/spack/package.py index 8c05620c..54f2348e 100644 --- a/spack/package.py +++ b/spack/package.py @@ -86,9 +86,9 @@ def url_for_version(self, version): ) variant( "ipolates", - default="0", - description="Use to interpolate to new grids (0 = OFF, 1 = ip, 3 = ip2)", - values=("0", "1", "3"), + default=False, + description="Use to interpolate to new grids", + when="@3.3:", ) variant( "spectral", default=False, description="Spectral interpolation in -new_grid", when="@:3.1" @@ -151,9 +151,8 @@ def url_for_version(self, version): conflicts("+openmp", when="%apple-clang") depends_on("wget", type=("build"), when="@:3.1 +netcdf4") - depends_on("ip@:3", when="@3.2 ipolates=1") - depends_on("ip2", when="@3.2 ipolates=3") - depends_on("ip@5.1:", when="@develop ipolates=1") + depends_on("ip@:3", when="@3.2 +ipolates") + depends_on("ip@5.1:", when="@develop +ipolates") depends_on("libaec@1.0.6:", when="@3.2: +aec") depends_on("netcdf-c", when="@3.2: +netcdf4") depends_on("jasper@:2", when="@3.2: +jasper") From 05e885ab58ddfe668febb55aeaa4046e255d5b91 Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:33:43 -0700 Subject: [PATCH 10/11] update ipolates variants to true/false --- .github/workflows/Spack.yml | 2 +- spack/package.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/Spack.yml b/.github/workflows/Spack.yml index cb1d9283..faede806 100644 --- a/.github/workflows/Spack.yml +++ b/.github/workflows/Spack.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: os: ["ubuntu-latest"] - variants: ["ipolates=0", "ipolates=1"] + variants: ["~ipolates", "+ipolates"] runs-on: ${{ matrix.os }} diff --git a/spack/package.py b/spack/package.py index 54f2348e..8a7ceed6 100644 --- a/spack/package.py +++ b/spack/package.py @@ -151,7 +151,6 @@ def url_for_version(self, version): conflicts("+openmp", when="%apple-clang") depends_on("wget", type=("build"), when="@:3.1 +netcdf4") - depends_on("ip@:3", when="@3.2 +ipolates") depends_on("ip@5.1:", when="@develop +ipolates") depends_on("libaec@1.0.6:", when="@3.2: +aec") depends_on("netcdf-c", when="@3.2: +netcdf4") From 482dafd40f4a658f0c3039cf61a0d3d6a48cd77f Mon Sep 17 00:00:00 2001 From: AlysonStahl-NOAA <166434581+AlysonStahl-NOAA@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:51:48 -0700 Subject: [PATCH 11/11] don't build sp or ip2 libraries --- .github/workflows/Linux_options.yml | 34 +---------------------------- .github/workflows/developer.yml | 34 +---------------------------- 2 files changed, 2 insertions(+), 66 deletions(-) diff --git a/.github/workflows/Linux_options.yml b/.github/workflows/Linux_options.yml index 037b2376..1b925824 100644 --- a/.github/workflows/Linux_options.yml +++ b/.github/workflows/Linux_options.yml @@ -71,22 +71,6 @@ jobs: make make install - - name: checkout-sp - uses: actions/checkout@v2 - with: - repository: NOAA-EMC/NCEPLIBS-sp - path: sp - ref: v2.3.3 - - - name: build-sp - run: | - cd sp - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=~/sp -DBUILD_8=ON .. - make -j2 - make install - - name: cache-ip id: cache-ip uses: actions/cache@v3 @@ -111,22 +95,6 @@ jobs: cmake .. -DCMAKE_INSTALL_PREFIX=~/ip -DCMAKE_PREFIX_PATH=~/sp make -j2 make install - - - name: checkout-ip2 - uses: actions/checkout@v2 - with: - repository: NOAA-EMC/NCEPLIBS-ip2 - path: ip2 - ref: develop - - - name: build-ip2 - run: | - cd ip2 - mkdir build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=~/ip2 -DCMAKE_PREFIX_PATH=~ - make -j2 - make install - name: checkout uses: actions/checkout@v2 @@ -138,6 +106,6 @@ jobs: cd wgrib2 mkdir b cd b - cmake ${{ matrix.config.options }} -DCMAKE_PREFIX_PATH="~/sp;~/ip;~/ip2" .. + cmake ${{ matrix.config.options }} -DCMAKE_PREFIX_PATH="~/ip" .. make VERBOSE=1 ctest --verbose --output-on-failure --rerun-failed diff --git a/.github/workflows/developer.yml b/.github/workflows/developer.yml index 7c822b5a..03ddd06a 100644 --- a/.github/workflows/developer.yml +++ b/.github/workflows/developer.yml @@ -57,38 +57,6 @@ jobs: make make install - - name: checkout-sp - uses: actions/checkout@v4 - with: - repository: NOAA-EMC/NCEPLIBS-sp - path: sp - ref: develop - - - name: build-sp - run: | - cd sp - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=~/sp -DBUILD_8=ON .. - make -j2 - make install - - - name: checkout-ip2 - uses: actions/checkout@v4 - with: - repository: NOAA-EMC/NCEPLIBS-ip2 - path: ip2 - ref: develop - - - name: build-ip2 - run: | - cd ip2 - mkdir build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=~/ip2 -DCMAKE_PREFIX_PATH=~ - make -j2 - make install - - name: checkout-ip uses: actions/checkout@v4 with: @@ -125,7 +93,7 @@ jobs: export CFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0' export FCFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0' export FFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0' - cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="~/ip;~/ip2;~/sp" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON + cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="~/ip" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON make VERBOSE=1 ctest --verbose --output-on-failure --rerun-failed gcovr --root .. -v --html-details --exclude ../tests --exclude CMakeFiles --print-summary -o test-coverage.html &> /dev/null