Skip to content

Commit cb3b6db

Browse files
authored
Merge branch 'main' into encode_jpeg_cuda_sync
2 parents c2ec15a + 77e95fc commit cb3b6db

33 files changed

+660
-514
lines changed

.github/scripts/setup-env.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ echo '::endgroup::'
4545

4646
if [[ "${OS_TYPE}" == windows && "${GPU_ARCH_TYPE}" == cuda ]]; then
4747
echo '::group::Install VisualStudio CUDA extensions on Windows'
48-
if [[ "${VC_YEAR:-}" == "2022" ]]; then
49-
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Microsoft/VC/v170/BuildCustomizations"
50-
else
51-
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Microsoft/VC/v160/BuildCustomizations"
52-
fi
48+
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Microsoft/VC/v170/BuildCustomizations"
5349
mkdir -p "${TARGET_DIR}"
5450
cp -r "${CUDA_HOME}/MSBuildExtensions/"* "${TARGET_DIR}"
5551
echo '::endgroup::'

.github/workflows/build-conda-linux.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

.github/workflows/build-conda-m1.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

.github/workflows/build-conda-windows.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
set -euxo pipefail
103103
104104
export PYTHON_VERSION=${{ matrix.python-version }}
105-
export VC_YEAR=2019
105+
export VC_YEAR=2022
106106
export VSDEVCMD_ARGS=""
107107
export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
108108
export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}

packaging/torchvision/conda_build_config.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

packaging/torchvision/meta.yaml

Lines changed: 0 additions & 74 deletions
This file was deleted.

packaging/vs2019/activate.bat

Lines changed: 0 additions & 44 deletions
This file was deleted.

packaging/vs2019/conda_build_config.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

packaging/vs2019/install_activate.bat

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)