Feature 2948 cxx17 (#2953)

* Per #2948, updating versions of ecbuild, eckit, and atlas * Per #2948, Adding MET_CXX_STANDARD * Per #2948, updated wording for MET_CXX_STANDARD description * Per #2948, updating script to work with two versions of ecbuild, eckit, and atlas * Per #2948, without this change, there are compilation problems if the user wants to compile wihtout python * Per #2948, fixing logic for MET_CXX_STANDARD * Per #2928, adding missing end bracket * Per #2948, fixed the logic for compiling versions of ecbuild, eckit, and atlas * Per 948, fixed syntax for setting CXXFLAGS * Per #2948, adding new Makefile.in files and configure and changing METbaseimage 3.2 to 3.3. * Per #2948, updating version of met base tag from 3.2 to 3.3 * Per #2948, adding --enable-all MET_CXX_STANDARD=11 job * Update compilation_options.yml * Per #2948, added a job10 for MET_CXX_STANDARD=14 * Per #2948, added brief documentation for the MET_CXX_STANDARD option --------- Co-authored-by: Julie Prestopnik <[email protected]> Co-authored-by: John Halley Gotway <[email protected]>
dtcenter · Sep 3, 2024 · c5fa790 · c5fa790
1 parent 30fa966
commit c5fa790
Show file tree

Hide file tree

Showing 152 changed files with 224 additions and 18 deletions.
diff --git a/.github/jobs/set_job_controls.sh b/.github/jobs/set_job_controls.sh
@@ -6,7 +6,7 @@ run_unit_tests=false
 run_diff=false
 run_update_truth=false
 met_base_repo=met-base
-met_base_tag=v3.2
+met_base_tag=v3.3
 input_data_version=develop
 truth_data_version=develop
 

diff --git a/.github/workflows/build_docker_and_trigger_metplus.yml b/.github/workflows/build_docker_and_trigger_metplus.yml
@@ -29,7 +29,7 @@ jobs:
         env:
           SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}-lite
           MET_BASE_REPO: met-base
-          MET_BASE_TAG: v3.2
+          MET_BASE_TAG: v3.3
 
       - name: Push Docker Image
         run: .github/jobs/push_docker_image.sh

diff --git a/.github/workflows/compilation_options.yml b/.github/workflows/compilation_options.yml
@@ -63,6 +63,10 @@ jobs:
             config: '--enable-mode_graphics'
           - jobid:  'job8'
             config: '--enable-modis'
+          - jobid:  'job9'
+            config: '--enable-all MET_CXX_STANDARD=11'
+          - jobid:  'job10'
+            config: '--enable-all MET_CXX_STANDARD=14'
       fail-fast: false
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -61,7 +61,7 @@ jobs:
         run: .github/jobs/build_sonarqube_image.sh
         env:
           MET_BASE_REPO: met-base
-          MET_BASE_TAG: v3.2
+          MET_BASE_TAG: v3.3
           SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}
           WD_REFERENCE_BRANCH: ${{ github.event.inputs.reference_branch }}
           SONAR_SCANNER_VERSION: 5.0.1.3006

diff --git a/Makefile.in b/Makefile.in
@@ -256,6 +256,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/configure b/configure
@@ -797,6 +797,7 @@ MET_ATLAS
 MET_PROJLIB
 MET_PROJINC
 MET_PROJ
+MET_CXX_STANDARD
 OPENMP_CFLAGS
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
@@ -933,6 +934,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
+MET_CXX_STANDARD
 MET_PROJ
 MET_PROJINC
 MET_PROJLIB
@@ -1667,6 +1669,9 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  MET_CXX_STANDARD
+              Specify the version of the supported C++ standard. Values may be
+              11, 14, or 17. Default value is 17.
   MET_PROJ    Where proj lib and include subdirectories are located. If they
               are installed in /usr/local, you don't have to specify them.
   MET_PROJINC Where proj include files are located. Use if the libraries and
@@ -5317,6 +5322,26 @@ printf "%s\n" "$ac_cv_prog_c_openmp" >&6; }
 CPPFLAGS="${CPPFLAGS} ${OPENMP_CFLAGS}"
 LDFLAGS="${LDFLAGS} ${OPENMP_CFLAGS}"
 
+#
+# Look for a specified C++ Standard
+#
+
+# Configure the variable. The help text will appear if the user uses "configure --help".
+
+
+
+# Set a default value
+
+if (test -z "$MET_CXX_STANDARD"); then
+  MET_CXX_STANDARD=17
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: c++17 will be used as the C++ standard" >&5
+printf "%s\n" "$as_me: c++17 will be used as the C++ standard" >&6;}
+elif (test -n "$MET_CXX_STANDARD"); then
+  MET_CXX_STANDARD=${MET_CXX_STANDARD}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: MET_CXX_STANDARD will be set" >&5
+printf "%s\n" "$as_me: MET_CXX_STANDARD will be set" >&6;}
+fi
+
 #
 # Look for the Proj library.
 #
@@ -6988,7 +7013,7 @@ fi
 CPPFLAGS=$CPPFLAGS' -DMET_BASE="\"$(pkgdatadir)\""'
 
 # Add -std=c++11 to CXXFLAGS
-CXXFLAGS=$CXXFLAGS' -std=c++11'
+CXXFLAGS=$CXXFLAGS' -std=c++'$MET_CXX_STANDARD
 
 # Define other variables for the makefiles
 

diff --git a/configure.ac b/configure.ac
@@ -15,6 +15,24 @@ AC_OPENMP()
 CPPFLAGS="${CPPFLAGS} ${OPENMP_CFLAGS}"
 LDFLAGS="${LDFLAGS} ${OPENMP_CFLAGS}"
 
+#
+# Look for a specified C++ Standard
+#
+
+# Configure the variable. The help text will appear if the user uses "configure --help".
+
+AC_ARG_VAR([MET_CXX_STANDARD], [Specify the version of the supported C++ standard. Values may be 11, 14, or 17. Default value is 17.])
+
+# Set a default value
+
+if (test -z "$MET_CXX_STANDARD"); then
+  MET_CXX_STANDARD=17
+  AC_MSG_NOTICE([c++17 will be used as the C++ standard])
+elif (test -n "$MET_CXX_STANDARD"); then
+  MET_CXX_STANDARD=${MET_CXX_STANDARD}
+  AC_MSG_NOTICE([MET_CXX_STANDARD will be set])
+fi
+
 #
 # Look for the Proj library.
 #
@@ -1160,7 +1178,7 @@ AM_CONDITIONAL([ENABLE_DEVELOPMENT], [test -n "$MET_DEVELOPMENT"])
 CPPFLAGS=$CPPFLAGS' -DMET_BASE="\"$(pkgdatadir)\""'
 
 # Add -std=c++11 to CXXFLAGS                                                                                                                                                 
-CXXFLAGS=$CXXFLAGS' -std=c++11'
+CXXFLAGS=$CXXFLAGS' -std=c++'$MET_CXX_STANDARD
 
 # Define other variables for the makefiles
 

diff --git a/data/Makefile.in b/data/Makefile.in
@@ -260,6 +260,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/climo/Makefile.in b/data/climo/Makefile.in
@@ -230,6 +230,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/climo/seeps/Makefile.in b/data/climo/seeps/Makefile.in
@@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/colortables/Makefile.in b/data/colortables/Makefile.in
@@ -260,6 +260,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/colortables/NCL_colortables/Makefile.in b/data/colortables/NCL_colortables/Makefile.in
@@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/config/Makefile.in b/data/config/Makefile.in
@@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/map/Makefile.in b/data/map/Makefile.in
@@ -260,6 +260,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/map/admin_by_country/Makefile.in b/data/map/admin_by_country/Makefile.in
@@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/poly/HMT_masks/Makefile.in b/data/poly/HMT_masks/Makefile.in
@@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/poly/Makefile.in b/data/poly/Makefile.in
@@ -260,6 +260,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/poly/NCEP_masks/Makefile.in b/data/poly/NCEP_masks/Makefile.in
@@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/ps/Makefile.in b/data/ps/Makefile.in
@@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/table_files/Makefile.in b/data/table_files/Makefile.in
@@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/data/tc_data/Makefile.in b/data/tc_data/Makefile.in
@@ -202,6 +202,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/docs/Users_Guide/installation.rst b/docs/Users_Guide/installation.rst
@@ -247,7 +247,7 @@ Environment Variable Descriptions
     containing the bin, include, lib, and share directories for Python.
 
     **MET_PYTHON_CC** - Format is -I followed by the directory containing
-    the Python include files (ex. -I/usr/local/python3/include/python3.10).
+    the Python include files (e.g. -I/usr/local/python3/include/python3.10).
     This information may be obtained by 
     running :code:`python3-config --cflags`;
     however, this command can, on certain systems, 
@@ -257,7 +257,7 @@ Environment Variable Descriptions
     the Python library 
     files then a space, then -l followed by the necessary Python
     libraries to link to 
-    (ex. -L/usr/local/python3/lib/\\ -lpython3.10\\
+    (e.g. -L/usr/local/python3/lib/\\ -lpython3.10\\
     -lpthread\\ -ldl\\ -lutil\\ -lm). 
     The backslashes are necessary in the example shown because of
     the spaces, which will be 
@@ -285,7 +285,11 @@ Environment Variable Descriptions
     without a specified value of cores to use.  The automated MET
     testing scripts in the 
     Docker environment have been successful with a value of
-    5 (ex. export MAKE_ARGS=”-j 5”).
+    5 (e.g. export MAKE_ARGS=”-j 5”).
+
+    **export MET_CXX_STANDARD** - Specify the version of the supported
+    C++ standard. Values may be 11, 14, or 17. The default value is 17.
+    (e.g. export MET_CXX_STANDARD=11).
 
 
 External Library Handling in compile_MET_all.sh

diff --git a/internal/scripts/docker/Dockerfile b/internal/scripts/docker/Dockerfile
@@ -1,5 +1,5 @@
 ARG MET_BASE_REPO=met-base
-ARG MET_BASE_TAG=v3.2
+ARG MET_BASE_TAG=v3.3
 
 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG}
 MAINTAINER John Halley Gotway <[email protected]>

diff --git a/internal/scripts/docker/Dockerfile.copy b/internal/scripts/docker/Dockerfile.copy
@@ -1,5 +1,5 @@
 ARG MET_BASE_REPO=met-base-unit-test
-ARG MET_BASE_TAG=v3.2
+ARG MET_BASE_TAG=v3.3
 
 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG}
 MAINTAINER John Halley Gotway <[email protected]>

diff --git a/internal/scripts/docker/Dockerfile.sonarqube b/internal/scripts/docker/Dockerfile.sonarqube
@@ -1,5 +1,5 @@
 ARG MET_BASE_REPO=met-base
-ARG MET_BASE_TAG=v3.2
+ARG MET_BASE_TAG=v3.3
 
 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG}
 MAINTAINER John Halley Gotway <[email protected]>

diff --git a/internal/scripts/installation/compile_MET_all.sh b/internal/scripts/installation/compile_MET_all.sh
@@ -640,7 +640,11 @@ if  [ $COMPILE_ECKIT -eq 1 ]; then
 
   # Need to obtain ecbuild before installing eckit
 
-  vrs="3.5.0"
+  if [[ ! -z ${MET_CXX_STANDARD} && ${MET_CXX_STANDARD} -le 14 ]]; then
+      vrs="3.5.0"
+  elif [[ -z ${MET_CXX_STANDARD} ]]; then
+      vrs="3.7.0"
+  fi
 
   echo  
   echo "Compiling ECBUILD at `date`"
@@ -652,9 +656,13 @@ if  [ $COMPILE_ECKIT -eq 1 ]; then
   run_cmd "mkdir build; cd build"
   run_cmd "cmake ../ -DCMAKE_INSTALL_PREFIX=${LIB_DIR} > $(pwd)/ecbuild.cmake.log 2>&1"
   run_cmd "make ${MAKE_ARGS} install > $(pwd)/ecbuild.make_install.log 2>&1"
-
-  vrs="1.20.2"
 
+  if [[ ! -z ${MET_CXX_STANDARD} && ${MET_CXX_STANDARD} -le 14 ]]; then
+      vrs="1.20.2"
+  elif [[ -z ${MET_CXX_STANDARD} ]]; then
+      vrs="1.24.4"
+  fi
+
   echo
   echo "Compiling ECKIT at `date`"
   mkdir -p ${LIB_DIR}/eckit
@@ -671,7 +679,11 @@ fi
 # Compile ATLAS
 if [ $COMPILE_ATLAS -eq 1 ]; then
 
-  vrs="0.30.0"
+  if [[ ! -z ${MET_CXX_STANDARD} && ${MET_CXX_STANDARD} -le 14 ]]; then  
+      vrs="0.30.0"
+  elif [[ -z ${MET_CXX_STANDARD} ]]; then
+      vrs="0.35.0"
+  fi
 
   echo
   echo "Compiling ATLAS at `date`"
@@ -862,9 +874,11 @@ if [ -z ${MET_PROJ} ]; then
   export MET_PROJ=${LIB_DIR}
 fi
 
-export MET_PYTHON_BIN_EXE=${MET_PYTHON_BIN_EXE:=${MET_PYTHON}/bin/python3}
-export MET_PYTHON_LD
-export MET_PYTHON_CC
+if [[ ! -z ${MET_PYTHON_CC} || ! -z ${MET_PYTHON_LD} ]]; then
+  export MET_PYTHON_BIN_EXE=${MET_PYTHON_BIN_EXE:=${MET_PYTHON}/bin/python3}
+  export MET_PYTHON_LD
+  export MET_PYTHON_CC
+fi
 
 # add flags to user-defined LDFLAGS for MacOS
 if [[ $machine != "Mac" ]]; then

diff --git a/internal/test_util/Makefile.in b/internal/test_util/Makefile.in
@@ -230,6 +230,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/internal/test_util/basic/Makefile.in b/internal/test_util/basic/Makefile.in
@@ -230,6 +230,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/internal/test_util/basic/vx_config/Makefile.in b/internal/test_util/basic/vx_config/Makefile.in
@@ -255,6 +255,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@

diff --git a/internal/test_util/basic/vx_log/Makefile.in b/internal/test_util/basic/vx_log/Makefile.in
@@ -224,6 +224,7 @@ MET_BUFRLIB = @MET_BUFRLIB@
 MET_CAIRO = @MET_CAIRO@
 MET_CAIROINC = @MET_CAIROINC@
 MET_CAIROLIB = @MET_CAIROLIB@
+MET_CXX_STANDARD = @MET_CXX_STANDARD@
 MET_ECKIT = @MET_ECKIT@
 MET_ECKITINC = @MET_ECKITINC@
 MET_ECKITLIB = @MET_ECKITLIB@