Merge branch 'HDFGroup:master' into master

hyoklee · Feb 27, 2024 · 007f772 · 007f772
2 parents cd60d84 + a123cdd
commit 007f772
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 12 deletions.
diff --git a/.github/workflows/aocc-auto.yml b/.github/workflows/aocc-auto.yml
@@ -7,6 +7,10 @@ on:
         description: "release vs. debug build"
         required: true
         type: string
+      build_option:
+        description: "--enable-production or --disable-production"
+        required: true
+        type: string
 
 permissions:
   contents: read
@@ -48,7 +52,7 @@ jobs:
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
           $GITHUB_WORKSPACE/configure \
-            --enable-build-mode=${{ inputs.build_mode }} \
+            ${{ inputs.build_option }} \
             --enable-netcdf \
             --enable-shared \
             --disable-fortran \
@@ -116,7 +120,7 @@ jobs:
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
           $GITHUB_WORKSPACE/configure \
-            --enable-build-mode=${{ inputs.build_mode }} \
+            ${{ inputs.build_option }} \
             --enable-netcdf \
             --disable-shared \
             --enable-fortran \

diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml
@@ -18,6 +18,7 @@ jobs:
             netcdf: enable
             shared: enable
             build_mode: "debug"
+            build_option: "--disable-production"
 
     call-release-netcdf-autotools:
       name: "Autotools Release NetCDF Workflows"
@@ -26,6 +27,7 @@ jobs:
             netcdf: enable
             shared: enable
             build_mode: "production"
+            build_option: "--enable-production"
 
     call-debug-static-autotools:
       name: "Autotools Debug Static Workflows"
@@ -34,6 +36,7 @@ jobs:
             netcdf: disable
             shared: disable
             build_mode: "debug"
+            build_option: "--disable-production"
 
     call-release-static-autotools:
       name: "Autotools Release Static Workflows"
@@ -42,21 +45,26 @@ jobs:
             netcdf: disable
             shared: disable
             build_mode: "production"
+            build_option: "--enable-production"
 
     call-release-auto-intel:
       name: "Autotools Intel Workflows"
       uses: ./.github/workflows/intel-auto.yml
       with:
             build_mode: "production"
+            build_option: "--enable-production"
 
     call-release-auto-nvhpc:
       name: "Autotools nvhpc Workflows"
       uses: ./.github/workflows/nvhpc-auto.yml
       with:
             build_mode: "production"
+            build_option: "--enable-production"
 
     call-release-auto-aocc:
       name: "Autotools aocc Workflows"
       uses: ./.github/workflows/aocc-auto.yml
       with:
             build_mode: "production"
+            build_option: "--enable-production"
+
diff --git a/.github/workflows/intel-auto.yml b/.github/workflows/intel-auto.yml
@@ -7,6 +7,10 @@ on:
         description: "release vs. debug build"
         required: true
         type: string
+      build_option:
+        description: "--enable-production or --disable-production"
+        required: true
+        type: string
 
 permissions:
   contents: read
@@ -57,7 +61,7 @@ jobs:
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
           $GITHUB_WORKSPACE/configure \
-            --enable-build-mode=${{ inputs.build_mode }} \
+            ${{ inputs.build_option }} \
             --enable-netcdf \
             --enable-shared \
             --disable-fortran

diff --git a/.github/workflows/main-auto.yml b/.github/workflows/main-auto.yml
@@ -8,6 +8,10 @@ on:
         description: "release vs. debug build"
         required: true
         type: string
+      build_option:
+        description: "--enable-production or --disable-production"
+        required: true
+        type: string
       shared:
         description: "shared enable/disable"
         required: true
@@ -59,7 +63,7 @@ jobs:
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
           $GITHUB_WORKSPACE/configure \
-            --enable-build-mode=${{ inputs.build_mode }} \
+            ${{ inputs.build_option }} \
             --${{ inputs.netcdf }}-netcdf \
             --disable-fortran \
             --${{ inputs.shared }}-java \

diff --git a/.github/workflows/nvhpc-auto.yml b/.github/workflows/nvhpc-auto.yml
@@ -7,6 +7,10 @@ on:
         description: "release vs. debug build"
         required: true
         type: string
+      build_option:
+        description: "--enable-production or --disable-production"
+        required: true
+        type: string
 
 permissions:
   contents: read
@@ -46,8 +50,7 @@ jobs:
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
           $GITHUB_WORKSPACE/configure \
-            FCFLAGS="-fPIC -fortranlibs" \
-            --enable-build-mode=${{ inputs.build_mode }} \
+            ${{ inputs.build_option }} \
             --disable-fortran \
             --enable-shared \
           #cat config.log

diff --git a/.github/workflows/ppc64.yml b/.github/workflows/ppc64.yml
@@ -43,7 +43,7 @@ jobs:
             mkdir "build"
             cd "build"
             ../configure \
-                --enable-build-mode=production \
+                --enable-production \
                 --enable-netcdf \
                 --disable-fortran \
                 --disable-java \

diff --git a/hdf/src/hdf_priv.h b/hdf/src/hdf_priv.h
@@ -25,6 +25,10 @@
 /* The library always uses UNIXBUFIO */
 #define FILELIB UNIXBUFIO
 
+/* Common library headers */
+#include "hdf.h"
+#include "herr_priv.h"
+
 /*--------------------------------------------------------------------------*/
 /*                              MT/NT constants                             */
 /*  Four MT nibbles represent double, float, int, uchar (from most          */
@@ -68,10 +72,6 @@
 #define DF_MT DFMT_LE
 #endif
 
-/* Common library headers */
-#include "hdf.h"
-#include "herr_priv.h"
-
 /* Standard C library headers */
 #include <assert.h>
 #include <ctype.h>

diff --git a/hdf/test/tutils.h b/hdf/test/tutils.h
@@ -177,7 +177,7 @@ extern
 
 #define MESSAGE(v, a)                                                                                        \
     {                                                                                                        \
-        if (Verbosity > v) {                                                                                 \
+        if (Verbosity >= v) {                                                                                \
             a                                                                                                \
         }                                                                                                    \
     }