Skip to content

Commit 51d7c06

Browse files
bottlerfacebook-github-bot
authored andcommitted
MKL version fix in CI (#1820)
Summary: Fix for "undefined symbol: iJIT_NotifyEvent" build issue, Pull Request resolved: #1820 Reviewed By: MichaelRamamonjisoa Differential Revision: D58685326 fbshipit-source-id: 48b54367c00851cc6fbb111ca98d69a2ace8361b
1 parent 00c36ec commit 51d7c06

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

packaging/build_conda.py

+6
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ def setup_cuda():
8080
def setup_conda_pytorch_constraint() -> List[str]:
8181
pytorch_constraint = f"- pytorch=={PYTORCH_VERSION}"
8282
os.environ["CONDA_PYTORCH_CONSTRAINT"] = pytorch_constraint
83+
if pytorch_major_minor < (2, 2):
84+
os.environ["CONDA_PYTORCH_MKL_CONSTRAINT"] = "- mkl!=2024.1.0"
85+
os.environ["SETUPTOOLS_CONSTRAINT"] = "- setuptools<70"
86+
else:
87+
os.environ["CONDA_PYTORCH_MKL_CONSTRAINT"] = ""
88+
os.environ["SETUPTOOLS_CONSTRAINT"] = "- setuptools"
8389
os.environ["CONDA_PYTORCH_BUILD_CONSTRAINT"] = pytorch_constraint
8490
os.environ["PYTORCH_VERSION_NODOT"] = PYTORCH_VERSION.replace(".", "")
8591

packaging/pytorch3d/meta.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ requirements:
1212

1313
host:
1414
- python
15-
- setuptools
15+
{{ environ.get('SETUPTOOLS_CONSTRAINT') }}
1616
{{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }}
17+
{{ environ.get('CONDA_PYTORCH_MKL_CONSTRAINT') }}
1718
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
1819
{{ environ.get('CONDA_CPUONLY_FEATURE') }}
1920

0 commit comments

Comments
 (0)