Skip to content

Commit

Permalink
Add windows 3.11 conda (#2063)
Browse files Browse the repository at this point in the history
  • Loading branch information
atalman committed Feb 17, 2023
1 parent 21261ea commit 2cd5e12
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 7 deletions.
34 changes: 34 additions & 0 deletions .circleci/config.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .circleci/config.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,9 @@ jobs:
conda env remove -n python${PYTHON_VERSION} || true
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
if [[ "${PYTHON_VERSION}" == "3.11" ]]; then
export CONDA_CHANNEL_FLAGS=" -c malfet"
fi
conda install -v -y ${CONDA_CHANNEL_FLAGS} -c pytorch-"${UPLOAD_CHANNEL}" pytorch
conda install -v -y ${CONDA_CHANNEL_FLAGS} -c ~/workspace/conda-bld torchtext
- run:
Expand Down
6 changes: 0 additions & 6 deletions .circleci/regenerate.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ def build_workflows(prefix="", upload=False, filter_branch=None, indentation=6):
continue
if os_type == "macos":
continue
# Not supporting Python 3.11 conda packages at the
# moment since the necessary dependencies are not
# available. Windows 3.11 Wheels will be built from
# CircleCI here, however.
if python_version == "3.11" and btype == "conda":
continue

w += build_workflow_pair(btype, os_type, python_version, fb, prefix, upload)

Expand Down
5 changes: 5 additions & 0 deletions packaging/build_conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,9 @@ setup_env
export SOURCE_ROOT_DIR="$PWD"
setup_conda_pytorch_constraint
setup_visual_studio_constraint

if [[ "$PYTHON_VERSION" == "3.11" ]]; then
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c malfet"
fi

conda build $CONDA_CHANNEL_FLAGS --no-anaconda-upload --python "$PYTHON_VERSION" packaging/torchtext
2 changes: 1 addition & 1 deletion packaging/pkg_helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ setup_conda_pytorch_constraint() {
# TODO: Remove me later, see https://github.com/pytorch/pytorch/issues/62424 for more details
if [[ "$(uname)" == Darwin ]]; then
arch_name="$(uname -m)"
if [ "${arch_name}" != "arm64" ]; then
if [[ "${arch_name}" != "arm64" && "${PYTHON_VERSION}" != "3.11" ]]; then
# Use less than equal to avoid version conflict in python=3.6 environment
export CONDA_EXTRA_BUILD_CONSTRAINT="- mkl<=2021.2.0"
fi
Expand Down

0 comments on commit 2cd5e12

Please sign in to comment.