small changes, adding back in hdf5

scrasmussen · Jun 22, 2024 · 019b484 · 019b484
1 parent 2cc487c
commit 019b484
Showing 1 changed file with 27 additions and 26 deletions.
diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml
@@ -120,6 +120,16 @@ jobs:
     # Install FORTRAN dependencies
     #######################################################################################
 
+    - name: Install Curl
+      run: |
+        sudo apt-get update
+        sudo apt-get install curl
+        sudo apt-get install libssl-dev libcurl4-openssl-dev
+
+    - name: Install zlib
+      run: |
+        sudo apt-get install zlib1g-dev
+
     # - name: Install zlib
     #   env:
     #     CFLAGS: -fPIC
@@ -132,29 +142,20 @@ jobs:
     #     make install
     #     echo "LD_LIBRARY_PATH=$zlib_ROOT/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
 
-    # - name: Install HDF5
-    #   env:
-    #     CPPFLAGS: -I${zlib_ROOT}/include
-    #     LDFLAGS: -L${zlib_ROOT}/lib
-    #   run: |
-    #     wget https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_14_1-2.tar.gz
-    #     tar -zxvf hdf5-1_14_1-2.tar.gz
-    #     cd hdf5-hdf5-1_14_1-2
-    #     ./configure --prefix=${HDF5_ROOT} --with-zlib=${zlib_ROOT}
-    #     make -j4
-    #     make install
-    #     echo "LD_LIBRARY_PATH=$HDF5_ROOT/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
-    #     echo "PATH=$HDF5_ROOT/lib:$PATH" >> $GITHUB_ENV
-
-    - name: Install Curl
-      run: |
-        sudo apt-get update
-        sudo apt-get install curl
-        sudo apt-get install libssl-dev libcurl4-openssl-dev
-
-    - name: Install zlib
+    - name: Install HDF5
+      # env:
+        # CPPFLAGS: -I${zlib_ROOT}/include
+        # LDFLAGS: -L${zlib_ROOT}/lib
       run: |
-        sudo apt-get install zlib1g-dev
+        wget https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_14_1-2.tar.gz
+        tar -zxvf hdf5-1_14_1-2.tar.gz
+        cd hdf5-hdf5-1_14_1-2
+        ./configure --prefix=${HDF5_ROOT}
+        # ./configure --prefix=${HDF5_ROOT}  --with-zlib=${zlib_ROOT}
+        make -j
+        make install
+        echo "LD_LIBRARY_PATH=$HDF5_ROOT/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+        echo "PATH=$HDF5_ROOT/lib:$PATH" >> $GITHUB_ENV
 
     - name: Configure OpenMPI
       run: |
@@ -250,7 +251,7 @@ jobs:
         git clone --branch v2.4.1 https://github.com/NOAA-EMC/NCEPLIBS-bacio.git bacio
         cd bacio && mkdir build && cd build
         cmake -DCMAKE_INSTALL_PREFIX=${bacio_ROOT} ../
-        make -j2
+        make -j
         make install
         echo "bacio_DIR=/home/runner/bacio/lib/cmake/bacio" >> $GITHUB_ENV
 
@@ -267,7 +268,7 @@ jobs:
         git clone --branch v2.3.3 https://github.com/NOAA-EMC/NCEPLIBS-sp.git NCEPLIBS-sp
         cd NCEPLIBS-sp && mkdir build && cd build
         cmake -DCMAKE_INSTALL_PREFIX=${sp_ROOT} ../
-        make -j2
+        make -j
         make install
         echo "sp_DIR=/home/runner/NCEPLIBS-sp/lib/cmake/sp" >> $GITHUB_ENV
 
@@ -284,7 +285,7 @@ jobs:
         git clone --branch v2.9.2 https://github.com/NOAA-EMC/NCEPLIBS-w3emc.git NCEPLIBS-w3emc
         cd NCEPLIBS-w3emc && mkdir build && cd build
         cmake -DCMAKE_INSTALL_PREFIX=${w3emc_ROOT} ../
-        make -j2
+        make -j
         make install
         echo "w3emc_DIR=/home/runner/myw3emc/lib/cmake/w3emc" >> $GITHUB_ENV
 
@@ -301,7 +302,7 @@ jobs:
     - name: Build SCM.
       run: |
         cd ${SCM_ROOT}/scm/bin
-        make -j4
+        make -j
 
     # - name: Download data for SCM
     #   run: |