diff --git a/scripts/cmake_config_file_vmec2000.json b/scripts/cmake_config_file_vmec2000.json index 4a7797d..f962a75 100644 --- a/scripts/cmake_config_file_vmec2000.json +++ b/scripts/cmake_config_file_vmec2000.json @@ -5,6 +5,6 @@ "-DNETCDF_INC_PATH=/usr/include", "-DNETCDF_LIB_PATH=/usr/lib/aarch64-linux-gnu", "-DBLA_VENDOR=OpenBLAS", - "-DSCALAPACK_PREFIX={CODE}/external/scalapack/build", + "-DSCALAPACK_LIB_NAME=libscalapack-openmpi.so", "-DF2PY_EXECUTABLE={CODE}/.venv/bin/f2py"] } diff --git a/scripts/setup_scalapack.sh b/scripts/setup_scalapack.sh deleted file mode 100755 index de53e67..0000000 --- a/scripts/setup_scalapack.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -if [ ! -d "scalapack" ] ; then - echo "Fetching and building ScaLapack..." - git clone https://github.com/Reference-ScaLAPACK/scalapack.git -fi -pushd scalapack -cmake -S. -Bbuild -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_Fortran_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC -pushd build -make -j$(nproc) -popd -popd diff --git a/scripts/setup_vmec2000.sh b/scripts/setup_vmec2000.sh index 18afe57..a2a2bf2 100755 --- a/scripts/setup_vmec2000.sh +++ b/scripts/setup_vmec2000.sh @@ -9,7 +9,7 @@ fi pushd VMEC2000 cp $CODE/scripts/cmake_config_file_vmec2000.json cmake_config_file.json sed -i "s|{CODE}|$CODE|g" cmake_config_file.json -cmake -S. -Bbuild -GNinja -DNETCDF_INC_PATH=/usr/include -DSCALAPACK_PREFIX=$CODE/external/scalapack/build -DBLA_VENDOR=OpenBLAS +cmake -S. -Bbuild -GNinja -DNETCDF_INC_PATH=/usr/include -DSCALAPACK_LIB_NAME=libscalapack-openmpi.so -DBLA_VENDOR=OpenBLAS pushd build ninja popd