Merge pull request #91 from JCSDA-internal/bugfix/gnu-container

Release prep
JCSDA · May 28, 2021 · daccca1 · daccca1
2 parents 993870b + bff7414
commit daccca1
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/buildscripts/build_stack.sh b/buildscripts/build_stack.sh
@@ -101,7 +101,7 @@ build_lib ECKIT eckit ecmwf 1.16.0
 build_lib FCKIT fckit ecmwf 0.9.2
 build_lib ATLAS atlas ecmwf 0.24.1
 build_lib ODB odb 0.18.1.r2
-build_lib ODC odc jcsda-internal 1.0.3
+build_lib ODC odc ecmwf 2021.03.0
 
 # ===============================================================================
 # Optional Extensions to the JEDI Stack

diff --git a/buildscripts/config/config_container-clang-mpich-dev.sh b/buildscripts/config/config_container-clang-mpich-dev.sh
@@ -38,7 +38,7 @@ export CXXFLAGS=""
 export LDFLAGS=""
 
 # Minimal JEDI Stack
-export      STACK_BUILD_CMAKE=N
+export      STACK_BUILD_CMAKE=Y
 export     STACK_BUILD_GITLFS=N
 export       STACK_BUILD_SZIP=Y
 export    STACK_BUILD_UDUNITS=Y
@@ -60,7 +60,7 @@ export   STACK_BUILD_PYBIND11=Y
 export   STACK_BUILD_GSL_LITE=Y
 
 # Optional Additions
-export           STACK_BUILD_ODC=N
+export           STACK_BUILD_ODC=Y
 export           STACK_BUILD_PIO=Y
 export          STACK_BUILD_GPTL=N
 export        STACK_BUILD_PYJEDI=Y
@@ -76,7 +76,7 @@ export          STACK_BUILD_ESMF=N
 export      STACK_BUILD_BASELIBS=N
 export     STACK_BUILD_PDTOOLKIT=N
 export          STACK_BUILD_TAU2=N
-export          STACK_BUILD_CGAL=N
+export          STACK_BUILD_CGAL=Y
 export          STACK_BUILD_GEOS=N
 export        STACK_BUILD_SQLITE=N
 export          STACK_BUILD_PROJ=N

diff --git a/buildscripts/config/config_container-gnu-openmpi-dev.sh b/buildscripts/config/config_container-gnu-openmpi-dev.sh
@@ -60,7 +60,7 @@ export   STACK_BUILD_PYBIND11=Y
 export   STACK_BUILD_GSL_LITE=Y
 
 # Optional Additions
-export           STACK_BUILD_ODC=N
+export           STACK_BUILD_ODC=Y
 export           STACK_BUILD_PIO=Y
 export          STACK_BUILD_GPTL=N
 export        STACK_BUILD_PYJEDI=Y

diff --git a/buildscripts/config/config_container-intel-impi-app.sh b/buildscripts/config/config_container-intel-impi-app.sh
@@ -43,7 +43,7 @@ export CXXFLAGS=""
 export LDFLAGS=""
 
 # Minimal JEDI Stack
-export      STACK_BUILD_CMAKE=N
+export      STACK_BUILD_CMAKE=Y
 export     STACK_BUILD_GITLFS=N
 export       STACK_BUILD_SZIP=Y
 export    STACK_BUILD_UDUNITS=Y
@@ -65,8 +65,8 @@ export   STACK_BUILD_PYBIND11=Y
 export   STACK_BUILD_GSL_LITE=Y
 
 # Optional Additions
-export           STACK_BUILD_ODC=N
-export           STACK_BUILD_PIO=N
+export           STACK_BUILD_ODC=Y
+export           STACK_BUILD_PIO=Y
 export        STACK_BUILD_PYJEDI=N
 export      STACK_BUILD_NCEPLIBS=N
 export        STACK_BUILD_JASPER=N
@@ -78,6 +78,8 @@ export          STACK_BUILD_ESMF=N
 export      STACK_BUILD_BASELIBS=N
 export     STACK_BUILD_PDTOOLKIT=N
 export          STACK_BUILD_TAU2=N
+export          STACK_BUILD_CGAL=Y
+
 
 # For help with finding packages
 export PATH=${PREFIX}/bin:$PATH

diff --git a/buildscripts/config/config_container-intel-impi-dev.sh b/buildscripts/config/config_container-intel-impi-dev.sh
@@ -42,7 +42,7 @@ export CXXFLAGS=""
 export LDFLAGS=""
 
 # Minimal JEDI Stack
-export      STACK_BUILD_CMAKE=N
+export      STACK_BUILD_CMAKE=Y
 export     STACK_BUILD_GITLFS=N
 export       STACK_BUILD_SZIP=Y
 export    STACK_BUILD_UDUNITS=Y
@@ -64,7 +64,7 @@ export   STACK_BUILD_PYBIND11=Y
 export   STACK_BUILD_GSL_LITE=Y
 
 # Optional Additions
-export           STACK_BUILD_ODC=N
+export           STACK_BUILD_ODC=Y
 export           STACK_BUILD_PIO=Y
 export          STACK_BUILD_GPTL=N
 export        STACK_BUILD_PYJEDI=Y
@@ -80,7 +80,7 @@ export          STACK_BUILD_ESMF=N
 export      STACK_BUILD_BASELIBS=N
 export     STACK_BUILD_PDTOOLKIT=N
 export          STACK_BUILD_TAU2=N
-export          STACK_BUILD_CGAL=N
+export          STACK_BUILD_CGAL=Y
 export          STACK_BUILD_JSON=Y
 export STACK_BUILD_JSON_SCHEMA_VALIDATOR=Y
 export           STACK_BUILD_FMS=N
diff --git a/buildscripts/libs/build_boost.sh b/buildscripts/libs/build_boost.sh
@@ -11,7 +11,7 @@ version=$1
 
 cd ${JEDI_STACK_ROOT}/${PKGDIR:-"pkg"}
 software=$name\_$(echo $version | sed 's/\./_/g')
-url="https://dl.bintray.com/boostorg/release/$version/source/$software.tar.gz"
+url="https://boostorg.jfrog.io/artifactory/main/release/$version/$software.tar.gz"
 [[ -d $software ]] || ( $WGET $url; tar -xf $software.tar.gz )
 [[ ${DOWNLOAD_ONLY} =~ [yYtT] ]] && exit 0
 [[ -d $software ]] && cd $software || ( echo "$software does not exist, ABORT!"; exit 1 )

diff --git a/buildscripts/libs/build_lapack.sh b/buildscripts/libs/build_lapack.sh
@@ -33,9 +33,9 @@ fi
 export FC=$SERIAL_FC
 export CC=$SERIAL_CC
 
-export FFLAGS="-fPIC ${FFLAGS}"
-export FCFLAGS="-fPIC ${FCFLAGS}"
-export CFLAGS="-fPIC ${CFLAGS}"
+export FFLAGS="-fPIC"
+export FCFLAGS="-fPIC"
+export CFLAGS="-fPIC"
 
 cd ${JEDI_STACK_ROOT}/${PKGDIR:-"pkg"}
 

diff --git a/buildscripts/libs/build_odc.sh b/buildscripts/libs/build_odc.sh
@@ -50,7 +50,7 @@ git checkout $version
 [[ -d build ]] && $SUDO rm -rf build
 mkdir -p build && cd build
 
-ecbuild -DCMAKE_INSTALL_PREFIX=$prefix --build=Release ..
+ecbuild --build=Release -DCMAKE_INSTALL_PREFIX=$prefix ..
 VERBOSE=$MAKE_VERBOSE make -j${NTHREADS:-4}
 VERBOSE=$MAKE_VERBOSE $SUDO make -j${NTHREADS:-4} install