Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python 3.11 remove temporary channel #3991

Merged
merged 2 commits into from
Apr 5, 2023
Merged

Python 3.11 remove temporary channel #3991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2de013e
Python 3.11 removing test channel
atalman Mar 31, 2023
d46da28
Remove Python 3.11 from binary macos matrix
atalman Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/scripts/install_torch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ export MATRIX_INSTALLATION="${MATRIX_INSTALLATION/torchvision}"
export MATRIX_INSTALLATION="${MATRIX_INSTALLATION/torchaudio}"
if [[ ${MATRIX_PACKAGE_TYPE} = "conda" ]]; then
export MATRIX_INSTALLATION=${MATRIX_INSTALLATION/"conda install"/"conda install --yes --quiet"}
if [[ ${MATRIX_PYTHON_VERSION} = "3.11" ]]; then
export MATRIX_INSTALLATION=${MATRIX_INSTALLATION/"-c pytorch"/" -c malfet -c pytorch"}
fi
fi
eval $MATRIX_INSTALLATION

Expand Down
29 changes: 9 additions & 20 deletions .github/workflows/build_conda_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,26 +127,15 @@ jobs:
export FFMPEG_ROOT="${PWD}"/third_party/ffmpeg
export USE_FFMPEG="1"

if [[ "${PYTHON_VERSION}" = "3.11" ]]; then
${CONDA_RUN} conda build \
-c defaults \
-c "${CUDATOOLKIT_CHANNEL}" \
-c "malfet" \
-c "pytorch-${CHANNEL}" \
--no-anaconda-upload \
--python "${PYTHON_VERSION}" \
--output-folder distr/ \
"${CONDA_PACKAGE_DIRECTORY}"
else
${CONDA_RUN} conda build \
-c defaults \
-c "${CUDATOOLKIT_CHANNEL}" \
-c "pytorch-${CHANNEL}" \
--no-anaconda-upload \
--python "${PYTHON_VERSION}" \
--output-folder distr/ \
"${CONDA_PACKAGE_DIRECTORY}"
fi
${CONDA_RUN} conda build \
-c defaults \
-c "${CUDATOOLKIT_CHANNEL}" \
-c "pytorch-${CHANNEL}" \
--no-anaconda-upload \
--python "${PYTHON_VERSION}" \
--output-folder distr/ \
"${CONDA_PACKAGE_DIRECTORY}"

- name: Upload artifact to GitHub
continue-on-error: true
uses: actions/upload-artifact@v3
Expand Down
29 changes: 9 additions & 20 deletions .github/workflows/build_conda_macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,25 +136,14 @@ jobs:
fi
export FFMPEG_ROOT="${PWD}/third_party/ffmpeg"

if [[ "${PYTHON_VERSION}" = "3.11" ]]; then
${CONDA_RUN} conda build \
-c defaults \
-c "malfet" \
-c "pytorch-${CHANNEL}" \
--no-anaconda-upload \
--python "${PYTHON_VERSION}" \
--output-folder distr/ \
--no-test \
"${CONDA_PACKAGE_DIRECTORY}"
else
${CONDA_RUN} conda build \
-c defaults \
-c "pytorch-${CHANNEL}" \
--no-anaconda-upload \
--python "${PYTHON_VERSION}" \
--output-folder distr/ \
"${CONDA_PACKAGE_DIRECTORY}"
fi
${CONDA_RUN} conda build \
-c defaults \
-c "pytorch-${CHANNEL}" \
--no-anaconda-upload \
--python "${PYTHON_VERSION}" \
--output-folder distr/ \
"${CONDA_PACKAGE_DIRECTORY}"

- name: Upload artifact to GitHub
continue-on-error: true
uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -196,7 +185,7 @@ jobs:
export CONDA_RUN_SMOKE="conda run -p ${CONDA_ENV_SMOKE}"

CONDA_LOCAL_CHANNEL="file://$(readlink -f ${{ inputs.repository }}/distr)"
${CONDA_RUN_SMOKE} conda install -v -y -c pytorch-${CHANNEL} -c "${CONDA_LOCAL_CHANNEL}" -c malfet distr::"${PACKAGE_NAME}"
${CONDA_RUN_SMOKE} conda install -v -y -c pytorch-${CHANNEL} -c "${CONDA_LOCAL_CHANNEL}" distr::"${PACKAGE_NAME}"

if [[ ! -f "${{ inputs.repository }}"/${SMOKE_TEST_SCRIPT} ]]; then
echo "${{ inputs.repository }}/${SMOKE_TEST_SCRIPT} not found"
Expand Down
8 changes: 3 additions & 5 deletions tools/scripts/generate_binary_build_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ def generate_conda_matrix(os: str, channel: str, with_cuda: str, limit_win_build
arches = ["cpu"]
python_versions = list(mod.PYTHON_ARCHES)

# temporarily remove python 3.11 from conda matrix for release validation
if(channel == RELEASE):
# remove python 3.11 conda from macos x86
if(os == "macos"):
python_versions = list_without(python_versions, ["3.11"])

if with_cuda == ENABLE and (os == "linux" or os == "windows"):
Expand Down Expand Up @@ -373,9 +373,7 @@ def generate_wheels_matrix(
for arch_version in arches:
gpu_arch_type = arch_type(arch_version)
gpu_arch_version = "" if arch_version == "cpu" else arch_version
# Skip rocm 3.11 binaries for now as the docker image are not correct
if python_version == "3.11" and gpu_arch_type == "rocm":
continue

desired_cuda = translate_desired_cuda(gpu_arch_type, gpu_arch_version)
ret.append(
{
Expand Down