Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into complex-lusolve
Browse files Browse the repository at this point in the history
  • Loading branch information
IvanYashchuk committed Nov 30, 2020
2 parents 59a41e3 + b514951 commit 262b786
Show file tree
Hide file tree
Showing 492 changed files with 33,332 additions and 22,279 deletions.
16 changes: 4 additions & 12 deletions .circleci/cimodel/data/binary_build_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ def get_processor_arch_name(gpu_version):
"cu" + gpu_version.strip("cuda") if gpu_version.startswith("cuda") else gpu_version
)


LINUX_PACKAGE_VARIANTS = OrderedDict(
manywheel=[
"3.6m",
Expand All @@ -44,18 +43,11 @@ def get_processor_arch_name(gpu_version):
],
)

# TODO: There's an issue with current Python 3.9 builds that only occurs during
# windows builds, let's just not build 3.9 for windows and figure out how
# to resolve afterwards
PYTHON_VERSIONS_NO_39 = [
v for v in dimensions.STANDARD_PYTHON_VERSIONS if v not in ['3.9']
]

CONFIG_TREE_DATA = OrderedDict(
linux=(dimensions.GPU_VERSIONS, LINUX_PACKAGE_VARIANTS),
macos=([None], OrderedDict(
wheel=PYTHON_VERSIONS_NO_39,
conda=PYTHON_VERSIONS_NO_39,
wheel=dimensions.STANDARD_PYTHON_VERSIONS,
conda=dimensions.STANDARD_PYTHON_VERSIONS,
libtorch=[
"3.7",
],
Expand All @@ -64,8 +56,8 @@ def get_processor_arch_name(gpu_version):
windows=(
[v for v in dimensions.GPU_VERSIONS if v not in ['cuda92'] + dimensions.ROCM_VERSION_LABELS],
OrderedDict(
wheel=PYTHON_VERSIONS_NO_39,
conda=PYTHON_VERSIONS_NO_39,
wheel=dimensions.STANDARD_PYTHON_VERSIONS,
conda=dimensions.STANDARD_PYTHON_VERSIONS,
libtorch=[
"3.7",
],
Expand Down

0 comments on commit 262b786

Please sign in to comment.