From 346cecc2c4aa3053ea8932077628fe5c6134af43 Mon Sep 17 00:00:00 2001 From: edoapra Date: Thu, 23 Oct 2025 15:08:29 -0700 Subject: [PATCH] cmake versions --- .../simint/libsimint_source/build_simint.sh | 4 ++++ src/libext/libext_utils/cmake.sh | 22 ++++++++++++++----- src/libext/libxc/build_libxc.sh | 5 +++++ src/libext/scalapack/build_scalapa.sh | 6 ++++- 4 files changed, 30 insertions(+), 7 deletions(-) mode change 100644 => 100755 src/libext/libext_utils/cmake.sh diff --git a/src/NWints/simint/libsimint_source/build_simint.sh b/src/NWints/simint/libsimint_source/build_simint.sh index 665ddbea0d..5d5c020081 100755 --- a/src/NWints/simint/libsimint_source/build_simint.sh +++ b/src/NWints/simint/libsimint_source/build_simint.sh @@ -9,6 +9,10 @@ # mysimpwd=`pwd` source ../../../libext/libext_utils/cmake.sh +ls -lrt /tmp/cmakepath_$(id -u).txt +cat /tmp/cmakepath_$(id -u).txt +export PATH=$(cat /tmp/cmakepath_$(id -u).txt):$PATH +echo PATH is $PATH cd $mysimpwd if [ -z "$(command -v python3)" ]; then echo python3 not installed diff --git a/src/libext/libext_utils/cmake.sh b/src/libext/libext_utils/cmake.sh old mode 100644 new mode 100755 index c386870183..c6cf0434a3 --- a/src/libext/libext_utils/cmake.sh +++ b/src/libext/libext_utils/cmake.sh @@ -2,11 +2,11 @@ get_cmake_release(){ UNAME_S=$(uname -s) CPU=$(uname -m) CMAKE_VER=3.26.0 - echo pwd is `pwd` + echo pwd is `pwd` > /tmp/cmake.log orgdir=`pwd` cmake_instdir=$1 - echo "Parameter #1 is $1" - echo cmake_instdir is $cmake_instdir + echo "Parameter #1 is $1" >> /tmp/cmake.log + echo cmake_instdir is $cmake_instdir >> /tmp/cmake.log rm -f cmake-${CMAKE_VER}.tar.gz if [[ ${UNAME_S} == "Linux" ]]; then if [[ ${CPU} == "x86_64" || ${CPU} == "aarch64" || ${CPU} == "i686" ]] ; then @@ -17,7 +17,12 @@ get_cmake_release(){ CMAKE_CPU=${CPU} fi CMAKE=`pwd`/cmake-${CMAKE_VER}-linux-${CMAKE_CPU}/bin/cmake - CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-linux-${CMAKE_CPU}.tar.gz + echo `pwd`/cmake-${CMAKE_VER}-linux-${CMAKE_CPU}/bin + echo returning `pwd`/cmake-${CMAKE_VER}-linux-${CMAKE_CPU}/bin >> /tmp/cmake.log + rm -f /tmp/cmakepath_$(id -u).txt + echo `pwd`/cmake-${CMAKE_VER}-linux-${CMAKE_CPU}/bin > /tmp/cmakepath_$(id -u).txt + echo new CMAKE is $CMAKE >> /tmp/cmake.log + CMAKE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-linux-${CMAKE_CPU}.tar.gz else get_cmake_master fi @@ -29,14 +34,17 @@ get_cmake_release(){ return 1 fi if [ -f ${CMAKE} ]; then - echo using existing ${CMAKE_VER} Cmake + echo using existing ${CMAKE_VER} Cmake >> /tmp/cmake.log else curl -L ${CMAKE_URL} -o cmake-${CMAKE_VER}.tar.gz tar xzf cmake-${CMAKE_VER}.tar.gz if [[ ${UNAME_S} == "Darwin" ]] ; then CMAKE=`pwd`/cmake-${CMAKE_VER}-macos-universal/CMake.app/Contents/bin/cmake + rm -f /tmp/cmakepath_$(id -u).txt + echo `pwd`/cmake-${CMAKE_VER}-macos-universal/CMake.app/Contents/bin > /tmp/cmakepath_$(id -u).txt else CMAKE=`pwd`/cmake-${CMAKE_VER}-linux-${CMAKE_CPU}/bin/cmake + echo `pwd`/cmake-${CMAKE_VER}-linux-${CMAKE_CPU}/bin fi fi cd $orgdir @@ -46,7 +54,7 @@ get_cmake_release(){ get_cmake_master(){ CMAKE_COMMIT=09dd52c9d2684e933a3e013abc4f6848cb1befbf if [[ -f "cmake-$CMAKE_COMMIT.zip" ]]; then - echo "using existing" "cmake-$CMAKE_COMMIT.zip" + echo "using existing" "cmake-$CMAKE_COMMIT.zip" >> /tmp/cmake.log else curl -L https://gitlab.kitware.com/cmake/cmake/-/archive/$CMAKE_COMMIT.zip -o cmake-$CMAKE_COMMIT.zip fi @@ -61,6 +69,8 @@ get_cmake_master(){ make -j4 make -j4 install CMAKE=`pwd`/../bin/cmake + rm -f /tmp/cmakepath_$(id -u).txt + echo `pwd`/../bin > /tmp/cmakepath_$(id -u).txt ${CMAKE} -version cd ../.. return 0 diff --git a/src/libext/libxc/build_libxc.sh b/src/libext/libxc/build_libxc.sh index 1020f4f672..d55508a250 100755 --- a/src/libext/libxc/build_libxc.sh +++ b/src/libext/libxc/build_libxc.sh @@ -1,6 +1,11 @@ #!/usr/bin/env bash #set -x source ../libext_utils/cmake.sh +source ../libext_utils/cmake.sh +ls -lrt /tmp/cmakepath_$(id -u).txt +cat /tmp/cmakepath_$(id -u).txt +export PATH=$(cat /tmp/cmakepath_$(id -u).txt):$PATH +echo PATH is $PATH check_tgz() { myexit=0 diff --git a/src/libext/scalapack/build_scalapa.sh b/src/libext/scalapack/build_scalapa.sh index 0c17f906a4..85a1eda218 100755 --- a/src/libext/scalapack/build_scalapa.sh +++ b/src/libext/scalapack/build_scalapa.sh @@ -6,7 +6,11 @@ declare -a LIST_MPICWRAP LIST_MPICWRAP=( 'mpicc' 'mpicc' 'mpiicc' 'mpiicc' 'mpixlc_r' 'mpixlc' 'mpicc' 'mpifcc' 'mpifccpx' 'mpicc-mpich-mp' 'mpicc-mpich-mp' 'mpicc-openmpi-mp' 'mpicc-openmpi-mp') export LIST_MPICWRAP myscalapwd=`pwd` -source ../libext_utils/cmake.sh +source ../libext_utils/cmake.sh +ls -lrt /tmp/cmakepath_$(id -u).txt +cat /tmp/cmakepath_$(id -u).txt +export PATH=$(cat /tmp/cmakepath_$(id -u).txt):$PATH +echo PATH is $PATH cd $myscalapwd if [[ -z "${MPIF90}" ]]; then