Skip to content

Commit ed2296e

Browse files
committed
Changes for windows python 3.12
1 parent 8e2ade1 commit ed2296e

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Support/package_windows.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ ROOT=`pwd`
3636

3737
BUILD="/c/build"
3838
CONDA_LOC="/c/Miniconda/envs/shapeworks"
39-
cp ${CONDA_LOC}/python*.dll ${CONDA_LOC}/Library/bin/zlib.dll ${CONDA_LOC}/Library/bin/tbb12.dll ${CONDA_LOC}/Library/bin/zstd.dll ${CONDA_LOC}/Library/bin/libpng16.dll ${CONDA_LOC}/Library/bin/half.dll ${CONDA_LOC}/Library/bin/boost_filesystem.dll ${CONDA_LOC}/Library/bin/spdlog.dll ${CONDA_LOC}/Library/bin/*ffi*.dll ${CONDA_LOC}/Library/bin/libbz2.dll $BUILD/bin/Release
39+
40+
ls -la ${CONDA_LOC}/Library/bin
41+
42+
cp ${CONDA_LOC}/python*.dll ${CONDA_LOC}/Library/bin/zlib.dll ${CONDA_LOC}/Library/bin/tbb12.dll ${CONDA_LOC}/Library/bin/zstd.dll ${CONDA_LOC}/Library/bin/libpng16.dll ${CONDA_LOC}/Library/bin/half.dll ${CONDA_LOC}/Library/bin/boost_filesystem.dll ${CONDA_LOC}/Library/bin/spdlog.dll ${CONDA_LOC}/Library/bin/*ffi*.dll ${CONDA_LOC}/Library/bin/libbz2.dll ${CONDA_LOC}/Library/bin/libssl-3-x64.dll ${CONDA_LOC}/Library/bin/libcrypto-3-x64.dll ${CONDA_LOC}/Library/bin/pcre2-16.dll $BUILD/bin/Release
4043

4144
# install visual studio redistributables
4245
WIN_DIR="/c/Windows/system32"

install_shapeworks.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ call conda config --add channels anaconda
1111
call conda config --add channels conda-forge
1212

1313
REM install shapeworks deps
14-
call conda create --yes --name %CONDAENV% python=3.9.13 pip=22.1.2 openssl==1.1.1w || goto :error
14+
call conda create --yes --name %CONDAENV% python=3.12 pip=24.3.1 openssl==0.3.30 || goto :error
1515
call conda activate %CONDAENV%
1616

1717
REM reactivate shapeworks environment
@@ -21,10 +21,10 @@ call conda activate %CONDAENV%
2121
call python -m pip install -r python_requirements.txt || goto :error
2222

2323
REM install ptorch using light-the-torch
24-
call ltt install torch==1.11.0 || goto :error
24+
call ltt install torch==2.2.2 || goto :error
2525

2626
REM different versions of open3d for different OSes, so we install it manually here
27-
call pip install open3d==0.17.0 || goto :error
27+
call pip install open3d==0.19.0 || goto :error
2828

2929
call pip install Python/DatasetUtilsPackage.tar.gz || goto :error
3030
call pip install Python/DocumentationUtilsPackage.tar.gz || goto :error

0 commit comments

Comments
 (0)