Skip to content

Commit 7e6eee7

Browse files
Toolchain fix stage4 (#5233)
* Update install_libtorch.sh update right `pkg_install_dir` * update libri version default in build*.sh * Update install_libtorch.sh Fix check of libtorch.zip
1 parent 1ea8072 commit 7e6eee7

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

toolchain/build_abacus_gnu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ FFTW3=$INSTALL_DIR/fftw-3.3.10
2929
CEREAL=$INSTALL_DIR/cereal-1.3.2/include/cereal
3030
LIBXC=$INSTALL_DIR/libxc-6.2.2
3131
RAPIDJSON=$INSTALL_DIR/rapidjson-1.1.0/
32-
# LIBRI=$INSTALL_DIR/LibRI-0.1.1
33-
# LIBCOMM=$INSTALL_DIR/LibComm-0.1.0
32+
# LIBRI=$INSTALL_DIR/LibRI-0.2.1.0
33+
# LIBCOMM=$INSTALL_DIR/LibComm-0.1.1
3434
# LIBTORCH=$INSTALL_DIR/libtorch-2.1.2/share/cmake/Torch
3535
# LIBNPY=$INSTALL_DIR/libnpy-1.0.1/include
3636
# DEEPMD=$HOME/apps/anaconda3/envs/deepmd

toolchain/build_abacus_intel-mpich.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ LIBXC=$INSTALL_DIR/libxc-6.2.2
2929
RAPIDJSON=$INSTALL_DIR/rapidjson-1.1.0/
3030
# LIBTORCH=$INSTALL_DIR/libtorch-2.1.2/share/cmake/Torch
3131
# LIBNPY=$INSTALL_DIR/libnpy-1.0.1/include
32-
# LIBRI=$INSTALL_DIR/LibRI-0.1.1
33-
# LIBCOMM=$INSTALL_DIR/LibComm-0.1.0
32+
# LIBRI=$INSTALL_DIR/LibRI-0.2.1.0
33+
# LIBCOMM=$INSTALL_DIR/LibComm-0.1.1
3434
# DEEPMD=$HOME/apps/anaconda3/envs/deepmd
3535

3636
cmake -B $BUILD_DIR -DCMAKE_INSTALL_PREFIX=$PREFIX \

toolchain/build_abacus_intel.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ LIBXC=$INSTALL_DIR/libxc-6.2.2
2929
RAPIDJSON=$INSTALL_DIR/rapidjson-1.1.0/
3030
# LIBTORCH=$INSTALL_DIR/libtorch-2.1.2/share/cmake/Torch
3131
# LIBNPY=$INSTALL_DIR/libnpy-1.0.1/include
32-
# LIBRI=$INSTALL_DIR/LibRI-0.1.1
33-
# LIBCOMM=$INSTALL_DIR/LibComm-0.1.0
32+
# LIBRI=$INSTALL_DIR/LibRI-0.2.1.0
33+
# LIBCOMM=$INSTALL_DIR/LibComm-0.1.1
3434
# DEEPMD=$HOME/apps/anaconda3/envs/deepmd
3535

3636
# if use deepks and deepmd

toolchain/scripts/stage4/install_libtorch.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ case "${with_libtorch}" in
3737
__INSTALL__)
3838
echo "==================== Installing libtorch ===================="
3939
dirname="libtorch-${libtorch_ver}"
40-
filename="${dirname}.zip"
41-
pkg_install_dir="${INSTALLDIR}/${filename}"
40+
pkg_install_dir="${INSTALLDIR}/${dirname}"
4241
#pkg_install_dir="${HOME}/lib/libtorch/${libtorch_ver}"
4342
install_lock_file="${pkg_install_dir}/install_successful"
4443
archive_file="libtorch-cxx11-abi-shared-with-deps-${libtorch_ver}%2Bcpu.zip"
44+
filename="${dirname}.zip"
4545

4646
if verify_checksums "${install_lock_file}"; then
4747
echo "${filename} is already installed, skipping it."
4848
else
49-
if [ -f ${archive_file} ]; then
50-
echo "${archive_file} is found"
49+
if [ -f ${filename} ]; then
50+
echo "${filename} is found"
5151
else
5252
# download from pytorch.com and checksum
5353
url=https://download.pytorch.org/libtorch/cpu/${archive_file}

0 commit comments

Comments
 (0)