Merge branch 'main' into remove-conda

Author: NicolasHug

packaging/pre_build_script_arm64.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+echo "Building vision dependencies and wheel started."
+
+# Set environment variables
+export SRC_PATH="$GITHUB_WORKSPACE/$SRC_DIR"
+export CMAKE_BUILD_TYPE="$BUILD_TYPE"
+export VCVARSALL_PATH="$DEPENDENCIES_DIR/VSBuildTools/VC/Auxiliary/Build/vcvarsall.bat"
+export CONDA_PREFIX="$DEPENDENCIES_DIR"
+export PATH="$PATH:$CONDA_PREFIX/Library/bin"
+export DISTUTILS_USE_SDK=1
+export TRIPLET_FILE="triplets/arm64-windows.cmake"
+export PYTORCH_VERSION="$PYTORCH_VERSION"
+export CHANNEL="$CHANNEL"
+
+# Dependencies
+mkdir -p "$DOWNLOADS_DIR"
+mkdir -p "$DEPENDENCIES_DIR"
+echo "*" > "$DOWNLOADS_DIR/.gitignore"
+echo "*" > "$DEPENDENCIES_DIR/.gitignore"
+
+# Install vcpkg
+cd "$DOWNLOADS_DIR" || exit
+git clone https://github.com/microsoft/vcpkg.git
+cd vcpkg || exit
+./bootstrap-vcpkg.sh
+
+# Set vcpkg to only build release packages
+echo "set(VCPKG_BUILD_TYPE release)" >> "$TRIPLET_FILE"
+
+# Install dependencies using vcpkg
+./vcpkg install libjpeg-turbo:arm64-windows --x-install-root="$DEPENDENCIES_DIR"
+./vcpkg install libwebp:arm64-windows --x-install-root="$DEPENDENCIES_DIR"
+./vcpkg install libpng[tools]:arm64-windows --x-install-root="$DEPENDENCIES_DIR"
+
+# Copy files using cp
+cp "$DEPENDENCIES_DIR/arm64-windows/lib/libpng16.lib" "$DEPENDENCIES_DIR/arm64-windows/lib/libpng.lib"
+cp "$DEPENDENCIES_DIR/arm64-windows/bin/libpng16.dll" "$DEPENDENCIES_DIR/arm64-windows/bin/libpng.dll"
+cp "$DEPENDENCIES_DIR/arm64-windows/bin/libpng16.pdb" "$DEPENDENCIES_DIR/arm64-windows/bin/libpng.pdb"
+mkdir -p "$DEPENDENCIES_DIR/Library/"
+cp -r "$DEPENDENCIES_DIR/arm64-windows/"* "$DEPENDENCIES_DIR/Library/"
+cp -r "$DEPENDENCIES_DIR/Library/tools/libpng/"* "$DEPENDENCIES_DIR/Library/bin/"
+cp -r "$DEPENDENCIES_DIR/Library/bin/"* "$SRC_PATH/torchvision"
+
+# Source directory
+cd "$SRC_PATH" || exit
+
+# Create virtual environment
+python -m pip install --upgrade pip
+python -m venv .venv
+echo "*" > .venv/.gitignore
+source .venv/Scripts/activate
+
+# Install dependencies
+pip install numpy==2.2.3
+
+if [ "$CHANNEL" = "release" ]; then
+  echo "Installing latest stable version of PyTorch."
+  # TODO: update when arm64 torch available on pypi
+  pip3 install --pre torch --index-url https://download.pytorch.org/whl/torch/
+elif [ "$CHANNEL" = "test" ]; then
+  echo "Installing PyTorch version $PYTORCH_VERSION."
+  pip3 install --pre torch=="$PYTORCH_VERSION" --index-url https://download.pytorch.org/whl/test
+else
+  echo "CHANNEL is not set, installing PyTorch from nightly."
+  pip3 install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu
+fi
+
+echo "Dependencies install finished successfully."

setup.py

@@ -24,7 +24,7 @@
 NVCC_FLAGS = os.getenv("NVCC_FLAGS", None)
 # Note: the GPU video decoding stuff used to be called "video codec", which
 # isn't an accurate or descriptive name considering there are at least 2 other
-# video deocding backends in torchvision. I'm renaming this to "gpu video
+# video decoding backends in torchvision. I'm renaming this to "gpu video
 # decoder" where possible, keeping user facing names (like the env var below) to
 # the old scheme for BC.
 USE_GPU_VIDEO_DECODER = os.getenv("TORCHVISION_USE_VIDEO_CODEC", "1") == "1"
@@ -211,7 +211,7 @@ def find_libpng():
             subprocess.run([libpng_config, "--version"], stdout=subprocess.PIPE).stdout.strip().decode("utf-8")
         )
         if png_version < min_version:
-            warnings.warn("libpng version {png_version} is less than minimum required version {min_version}")
+            warnings.warn(f"libpng version {png_version} is less than minimum required version {min_version}")
             return False, None, None, None
 
         include_dir = (
@@ -448,7 +448,7 @@ def find_ffmpeg_libraries():
 
         extensions.append(
             CppExtension(
-                # This is an aweful name. It should be "cpu_video_decoder". Keeping for BC.
+                # This is an awful name. It should be "cpu_video_decoder". Keeping for BC.
                 "torchvision.video_reader",
                 combined_src,
                 include_dirs=[