Skip to content

Commit 2aa6f7e

Browse files
test
1 parent e73e5bd commit 2aa6f7e

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

packaging/pre_build_script_arm64.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ echo "Building vision dependencies and wheel started."
66
export SRC_PATH="$GITHUB_WORKSPACE/$SRC_DIR"
77
export CMAKE_BUILD_TYPE="$BUILD_TYPE"
88
export VCVARSALL_PATH="$DEPENDENCIES_DIR/VSBuildTools/VC/Auxiliary/Build/vcvarsall.bat"
9-
export CONDA_PREFIX="$DEPENDENCIES_DIR"
9+
export CONDA_PREFIX="$DEPENDENCIES_DIR/Library/"
1010
export PATH="$PATH:$CONDA_PREFIX/Library/bin"
1111
export DISTUTILS_USE_SDK=1
1212
export TRIPLET_FILE="triplets/x64-windows.cmake"
@@ -27,7 +27,6 @@ git clone https://github.com/microsoft/vcpkg.git
2727
cd vcpkg || exit
2828
./bootstrap-vcpkg.sh
2929

30-
3130
# # Set vcpkg to only build release packages
3231
echo "set(VCPKG_BUILD_TYPE release)" >> "$TRIPLET_FILE"
3332

@@ -36,7 +35,7 @@ echo "set(VCPKG_BUILD_TYPE release)" >> "$TRIPLET_FILE"
3635
./vcpkg install libwebp:x64-windows --x-install-root="$DEPENDENCIES_DIR"
3736
./vcpkg install libpng[tools]:x64-windows --x-install-root="$DEPENDENCIES_DIR"
3837

39-
# Copy files using cp (replace robocopy)
38+
# Copy files using cp
4039
cp "$DEPENDENCIES_DIR/x64-windows/lib/libpng16.lib" "$DEPENDENCIES_DIR/x64-windows/lib/libpng.lib"
4140
cp "$DEPENDENCIES_DIR/x64-windows/bin/libpng16.dll" "$DEPENDENCIES_DIR/x64-windows/bin/libpng.dll"
4241
cp "$DEPENDENCIES_DIR/x64-windows/bin/libpng16.pdb" "$DEPENDENCIES_DIR/x64-windows/bin/libpng.pdb"
@@ -46,6 +45,10 @@ cp -r "$DEPENDENCIES_DIR/x64-windows/"* "$DEPENDENCIES_DIR/Library/"
4645
cp -r "$DEPENDENCIES_DIR/Library/tools/libpng/"* "$DEPENDENCIES_DIR/Library/bin/"
4746
cp -r "$DEPENDENCIES_DIR/Library/bin/"* "$SRC_PATH/torchvision"
4847

48+
ls -l "$DEPENDENCIES_DIR/Library/"
49+
ls -l "$DEPENDENCIES_DIR/Library/bin/"
50+
ls -l "$SRC_PATH/torchvision"
51+
4952
# Source directory
5053
cd "$SRC_PATH" || exit
5154

0 commit comments

Comments
 (0)