ip v5 updates

Author: AlexanderRichert-NOAA

.github/workflows/Intel.yml

@@ -24,6 +24,7 @@ jobs:
     strategy:
       matrix:
         compilers: ["CC=icc FC=ifort", "CC=icx FC=ifx"]
+        ip_version: ["v5.0.0", "v4.5.0"]
 
     steps:
 
@@ -90,20 +91,21 @@ jobs:
     - name: cache-sp
       id: cache-sp
       uses: actions/cache@v3
+      if: matrix.ip_version == 'v4.5.0'
       with:
         path: ~/sp
         key: sp-Intel-${{ matrix.compilers }}-${{ runner.os }}-v2.4.0
 
     - name: checkout-sp
-      if: steps.cache-sp.outputs.cache-hit != 'true'
+      if: steps.cache-sp.outputs.cache-hit != 'true' && matrix.ip_version == 'v4.5.0'
       uses: actions/checkout@v3
       with:
         repository: NOAA-EMC/NCEPLIBS-sp
         path: sp
         ref: v2.4.0
 
     - name: build-sp
-      if: steps.cache-sp.outputs.cache-hit != 'true'
+      if: steps.cache-sp.outputs.cache-hit != 'true' && matrix.ip_version == 'v4.5.0'
       run: |
         cd sp
         mkdir build
@@ -142,15 +144,15 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/ip
-        key: ip-Intel-${{ matrix.compilers }}-${{ runner.os }}-v4.3.0
+        key: ip-Intel-${{ matrix.compilers }}-${{ runner.os }}-${{ matrix.ip_version }}
 
     - name: checkout-ip
       if: steps.cache-ip.outputs.cache-hit != 'true'
       uses: actions/checkout@v3
       with:
         repository: NOAA-EMC/NCEPLIBS-ip
         path: ip
-        ref: v4.3.0
+        ref: ${{ matrix.ip_version }}
 
     - name: build-ip
       if: steps.cache-ip.outputs.cache-hit != 'true'

.github/workflows/Linux_versions.yml

@@ -26,8 +26,13 @@ jobs:
         bacio-version: [2.4.1, 2.5.0, 2.6.0]
         jasper-version: [4.0.0]
         w3emc-version: [2.10.0, 2.11.0]
-        sp-version: [2.3.3, 2.4.0]
-        ip-version: [3.3.3, 4.1.0, 4.2.0]
+        sp-version: [2.3.3, 2.4.0, null]
+        ip-version: [3.3.3, 4.1.0, 4.2.0, 5.0.0]
+      exclude:
+        - sp-version: 2.3.3
+          ip-version: 5.0.0
+        - sp-version: 2.4.0
+          ip-version: 5.0.0
 
     steps:
     - name: install-dependencies
@@ -86,20 +91,21 @@ jobs:
     - name: cache-sp
       id: cache-sp
       uses: actions/cache@v3
+      if: matrix.sp-version != 'null'
       with:
         path: ~/sp
         key: sp-${{ runner.os }}-${{ matrix.sp-version }}
 
     - name: checkout-sp
-      if: steps.cache-sp.outputs.cache-hit != 'true'
+      if: steps.cache-sp.outputs.cache-hit != 'true' && matrix.sp-version != 'null'
       uses: actions/checkout@v3
       with:
         repository: NOAA-EMC/NCEPLIBS-sp
         path: sp
         ref: v${{ matrix.sp-version }}
 
     - name: build-sp
-      if: steps.cache-sp.outputs.cache-hit != 'true'
+      if: steps.cache-sp.outputs.cache-hit != 'true' && matrix.sp-version != 'null'
       run: |
         cd sp
         mkdir build

.github/workflows/MacOS.yml

@@ -71,31 +71,6 @@ jobs:
         cmake .. -DCMAKE_INSTALL_PREFIX=~/bacio
         make -j2
         make install
-
-    - name: cache-sp
-      id: cache-sp
-      uses: actions/cache@v3
-      with:
-        path: ~/sp
-        key: sp-${{ runner.os }}-2.4.0
-
-    - name: checkout-sp
-      if: steps.cache-sp.outputs.cache-hit != 'true'
-      uses: actions/checkout@v3
-      with:
-        repository: NOAA-EMC/NCEPLIBS-sp
-        path: sp
-        ref: v2.4.0
-
-    - name: build-sp
-      if: steps.cache-sp.outputs.cache-hit != 'true'
-      run: |
-        cd sp
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=~/sp
-        make -j2
-        make install
           
     - name: cache-w3emc
       id: cache-w3emc
@@ -127,23 +102,23 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/ip
-        key: ip-MacOS-${{ runner.os }}-4.2.0
+        key: ip-MacOS-${{ runner.os }}-5.0.0
 
     - name: checkout-ip
       if: steps.cache-ip.outputs.cache-hit != 'true'
       uses: actions/checkout@v3
       with:
         repository: NOAA-EMC/NCEPLIBS-ip
         path: ip
-        ref: v4.2.0
+        ref: v5.0.0
 
     - name: build-ip
       if: steps.cache-ip.outputs.cache-hit != 'true'
       run: |
         cd ip
         mkdir build
         cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=~/ip -DCMAKE_PREFIX_PATH=~/sp
+        cmake .. -DCMAKE_INSTALL_PREFIX=~/ip
         make -j2
         make install
           
@@ -181,6 +156,6 @@ jobs:
       run: |
         cd grib_utils
         mkdir build && cd build
-        cmake -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/sp;~/ip;~/w3emc;~/g2" ..
+        cmake -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/ip;~/w3emc;~/g2" ..
         make -j2
         ctest --output-on-failure --rerun-failed --verbose

.github/workflows/Spack.yml

@@ -23,6 +23,7 @@ jobs:
       matrix:
         os: ["ubuntu-latest"]
         openmp: ["+openmp", "~openmp"]
+        ip_spec: ["^ip@5.0.0", "^ip@4.2.0 ^sp@2.4.0"]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -37,7 +38,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/spack-build-cache
-        key: spack-build-cache-${{ matrix.os }}-1
+        key: spack-build-cache-${{ matrix.os }}-${{ matrix.ip_spec }}1
 
     - name: spack-build-and-test
       run: |
@@ -48,7 +49,7 @@ jobs:
         cp $GITHUB_WORKSPACE/grib-util/spack/package.py $SPACK_ROOT/var/spack/repos/builtin/packages/grib-util/package.py
         mv $GITHUB_WORKSPACE/grib-util $SPACK_ENV/grib-util
         spack develop --no-clone grib-util@develop
-        spack add grib-util@develop%gcc@11 ${{ matrix.openmp }} ^bacio@2.6.0 ^w3emc@2.10.0 ^g2@3.4.8 ^g2c@develop ^ip@4.2.0 ^sp@2.4.0
+        spack add grib-util@develop%gcc@11 ${{ matrix.openmp }} ^bacio@2.6.0 ^w3emc@2.10.0 ^g2@3.4.8 ^g2c@develop ${{ ip_spec }}
         spack external find cmake gmake
         spack mirror add spack-build-cache ~/spack-build-cache
         spack concretize

.github/workflows/developer.yml

@@ -65,22 +65,6 @@ jobs:
         cmake -DCMAKE_INSTALL_PREFIX=~/bacio ..
         make -j2
         make install
-
-    - name: checkout-sp
-      uses: actions/checkout@v3
-      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 ..
-        make -j2
-        make install
           
     - name: checkout-w3emc
       uses: actions/checkout@v3
@@ -110,7 +94,7 @@ jobs:
         cd ip
         mkdir build
         cd build
-        cmake -DCMAKE_INSTALL_PREFIX=~/ip -DCMAKE_PREFIX_PATH=~/sp ..
+        cmake -DCMAKE_INSTALL_PREFIX=~/ip
         make -j2
         make install
           
@@ -161,7 +145,7 @@ jobs:
         ls -l ~/jasper/lib
         export LD_LIBRARY_PATH=/home/runner/jasper/lib
         export PATH="~/g2c/bin:$PATH"
-        cmake -DENABLE_DOCS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/sp;~/ip;~/w3emc;~/g2;~/g2c" -DCMAKE_Fortran_FLAGS="-fprofile-arcs -ftest-coverage -O0 -Wall" -DCMAKE_C_FLAGS="-fprofile-arcs -ftest-coverage -O0 -Wall" -DG2C_COMPARE=ON ..
+        cmake -DENABLE_DOCS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH="~/bacio;~/jasper;~/ip;~/w3emc;~/g2;~/g2c" -DCMAKE_Fortran_FLAGS="-fprofile-arcs -ftest-coverage -O0 -Wall" -DCMAKE_C_FLAGS="-fprofile-arcs -ftest-coverage -O0 -Wall" -DG2C_COMPARE=ON ..
         make -j2 VERBOSE=1
         ctest --output-on-failure --rerun-failed --verbose
 

CMakeLists.txt

@@ -8,7 +8,7 @@ file(STRINGS "VERSION" pVersion)
 project(gributil VERSION ${pVersion} LANGUAGES C Fortran)
 
 # Handle user options.
-option(OPENMP "use OpenMP threading" OFF)
+option(OPENMP "Use OpenMP threading" OFF)
 option(ENABLE_DOCS "Enable generation of doxygen-based documentation." OFF)
 option(FTP_TEST_FILES "Fetch and test with files on FTP site." OFF)
 option(FTP_LARGE_TEST_FILES "Fetch and test with very large files on FTP site." OFF)
@@ -39,8 +39,10 @@ find_package(ZLIB REQUIRED)
 
 # Find the NCEPLIBS libraries we need.
 find_package(bacio 2.4.0 REQUIRED)
-find_package(sp 2.3.3 REQUIRED)
 find_package(ip 3.3.3 REQUIRED)
+if(ip_VERSION LESS 5.0)
+  find_package(sp 2.3.3 REQUIRED)
+endif()
 find_package(w3emc 2.10.0 REQUIRED)
 find_package(g2 3.4.8 REQUIRED)
 # g2c is not required.

README.md

@@ -55,8 +55,8 @@ Project | Notes
 Repository | Notes
 -----------|------
 [NCEPLIBS-bacio](https://github.com/NOAA-EMC/NCEPLIBS-bacio) | binary I/O for NCEP models
-[NCEPLIBS-sp](https://github.com/NOAA-EMC/NCEPLIBS-sp) | spectral transform functions
 [NCEPLIBS-ip](https://github.com/NOAA-EMC/NCEPLIBS-ip) | interpolating between NCEP grids
+[NCEPLIBS-sp](https://github.com/NOAA-EMC/NCEPLIBS-sp) | spectral transform functions - only needed for ip v4 and lower
 [NCEPLIBS-g2](https://github.com/NOAA-EMC/NCEPLIBS-g2) | Fortran implementation of the GRIB 2 functions
 [NCEPLIBS-w3emc](https://github.com/NOAA-EMC/NCEPLIBS-w3emc) | GRIB1 library
 

spack/package.py

@@ -1,4 +1,4 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
 # Spack Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
@@ -25,24 +25,23 @@ class GribUtil(CMakePackage):
 
     depends_on("jasper")
     depends_on("libpng")
-    depends_on("zlib")
+    depends_on("zlib-api")
     depends_on("w3emc +extradeps", when="@1.2.4:")
     depends_on("w3emc precision=4,d", when="^w3emc@2.10:")
     depends_on("w3nco", when="@:1.2.3")
     depends_on("g2")
-    depends_on("g2c@1.7: +utils")
     depends_on("bacio")
     depends_on("ip")
-    depends_on("ip precision=d", when="ip@4.1:")
+    depends_on("ip precision=d", when="^ip@4.1:")
     depends_on("ip@:3.3.3", when="@:1.2")
-    depends_on("sp")
-    depends_on("sp precision=d", when="sp@2.4:")
+    depends_on("sp", when="^ip@:4")
+    depends_on("sp precision=d", when="^ip@:4 ^sp@2.4:")
 
     def cmake_args(self):
         args = [
             self.define_from_variant("OPENMP", "openmp"),
             self.define("BUILD_TESTING", self.run_tests),
-            self.define("G2C_COMPARE", self.run_tests),
+            self.define("G2C_COMPARE", False),
         ]
         return args
 

src/copygb/CMakeLists.txt

@@ -18,7 +18,10 @@ set(fortran_src copygb.F90)
 # Build the executable.
 set(exe_name copygb)
 add_executable(${exe_name} ${fortran_src})
-target_link_libraries(${exe_name} PRIVATE bacio::${bacio_name} w3emc::w3emc_d ip::ip_d sp::sp_d)
+target_link_libraries(${exe_name} PRIVATE bacio::${bacio_name} w3emc::w3emc_d ip::ip_d)
+if(ip_VERSION LESS 5.0)
+  target_link_libraries(${exe_name} PRIVATE sp::sp_d)
+endif()
 
 # Use openMP if found.
 if(OpenMP_Fortran_FOUND)

src/copygb2/CMakeLists.txt

@@ -24,8 +24,11 @@ target_link_libraries(${exe_name} PRIVATE
   ${JASPER_LIBRARIES}
   bacio::${bacio_name}
   w3emc::w3emc_d
-  ip::ip_d
-  sp::sp_d)
+  ip::ip_d)
+
+if(ip_VERSION LESS 5.0)
+  target_link_libraries(${exe_name} PRIVATE sp::sp_d)
+endif()
 
 # If OpenMP is available, use it.
 if(OpenMP_Fortran_FOUND)