version 0.7.7

Summary: New version Reviewed By: MichaelRamamonjisoa Differential Revision: D58668979 fbshipit-source-id: 195eaf83e4da51a106ef72e38dbb98c51c51724c
require pytorch 2.0+
2025-12-22 23:30:35 +08:00 · 2024-06-25 06:59:24 -07:00 · 2024-06-21 08:15:17 -07:00 · 2024-06-21 08:15:17 -07:00 · 2024-06-20 14:06:28 -07:00
7 changed files with 11 additions and 176 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -162,62 +162,6 @@ workflows:
    jobs:
      # - main:
      #     context: DOCKERHUB_TOKEN
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda113
-          context: DOCKERHUB_TOKEN
-          cu_version: cu113
-          name: linux_conda_py38_cu113_pyt1120
-          python_version: '3.8'
-          pytorch_version: 1.12.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py38_cu116_pyt1120
-          python_version: '3.8'
-          pytorch_version: 1.12.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda113
-          context: DOCKERHUB_TOKEN
-          cu_version: cu113
-          name: linux_conda_py38_cu113_pyt1121
-          python_version: '3.8'
-          pytorch_version: 1.12.1
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py38_cu116_pyt1121
-          python_version: '3.8'
-          pytorch_version: 1.12.1
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py38_cu116_pyt1130
-          python_version: '3.8'
-          pytorch_version: 1.13.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda117
-          context: DOCKERHUB_TOKEN
-          cu_version: cu117
-          name: linux_conda_py38_cu117_pyt1130
-          python_version: '3.8'
-          pytorch_version: 1.13.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py38_cu116_pyt1131
-          python_version: '3.8'
-          pytorch_version: 1.13.1
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda117
-          context: DOCKERHUB_TOKEN
-          cu_version: cu117
-          name: linux_conda_py38_cu117_pyt1131
-          python_version: '3.8'
-          pytorch_version: 1.13.1
      - binary_linux_conda:
          conda_docker_image: pytorch/conda-builder:cuda117
          context: DOCKERHUB_TOKEN
@@ -330,62 +274,6 @@ workflows:
          name: linux_conda_py38_cu121_pyt231
          python_version: '3.8'
          pytorch_version: 2.3.1
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda113
-          context: DOCKERHUB_TOKEN
-          cu_version: cu113
-          name: linux_conda_py39_cu113_pyt1120
-          python_version: '3.9'
-          pytorch_version: 1.12.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py39_cu116_pyt1120
-          python_version: '3.9'
-          pytorch_version: 1.12.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda113
-          context: DOCKERHUB_TOKEN
-          cu_version: cu113
-          name: linux_conda_py39_cu113_pyt1121
-          python_version: '3.9'
-          pytorch_version: 1.12.1
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py39_cu116_pyt1121
-          python_version: '3.9'
-          pytorch_version: 1.12.1
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py39_cu116_pyt1130
-          python_version: '3.9'
-          pytorch_version: 1.13.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda117
-          context: DOCKERHUB_TOKEN
-          cu_version: cu117
-          name: linux_conda_py39_cu117_pyt1130
-          python_version: '3.9'
-          pytorch_version: 1.13.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py39_cu116_pyt1131
-          python_version: '3.9'
-          pytorch_version: 1.13.1
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda117
-          context: DOCKERHUB_TOKEN
-          cu_version: cu117
-          name: linux_conda_py39_cu117_pyt1131
-          python_version: '3.9'
-          pytorch_version: 1.13.1
      - binary_linux_conda:
          conda_docker_image: pytorch/conda-builder:cuda117
          context: DOCKERHUB_TOKEN
@@ -498,62 +386,6 @@ workflows:
          name: linux_conda_py39_cu121_pyt231
          python_version: '3.9'
          pytorch_version: 2.3.1
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda113
-          context: DOCKERHUB_TOKEN
-          cu_version: cu113
-          name: linux_conda_py310_cu113_pyt1120
-          python_version: '3.10'
-          pytorch_version: 1.12.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py310_cu116_pyt1120
-          python_version: '3.10'
-          pytorch_version: 1.12.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda113
-          context: DOCKERHUB_TOKEN
-          cu_version: cu113
-          name: linux_conda_py310_cu113_pyt1121
-          python_version: '3.10'
-          pytorch_version: 1.12.1
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py310_cu116_pyt1121
-          python_version: '3.10'
-          pytorch_version: 1.12.1
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py310_cu116_pyt1130
-          python_version: '3.10'
-          pytorch_version: 1.13.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda117
-          context: DOCKERHUB_TOKEN
-          cu_version: cu117
-          name: linux_conda_py310_cu117_pyt1130
-          python_version: '3.10'
-          pytorch_version: 1.13.0
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda116
-          context: DOCKERHUB_TOKEN
-          cu_version: cu116
-          name: linux_conda_py310_cu116_pyt1131
-          python_version: '3.10'
-          pytorch_version: 1.13.1
-      - binary_linux_conda:
-          conda_docker_image: pytorch/conda-builder:cuda117
-          context: DOCKERHUB_TOKEN
-          cu_version: cu117
-          name: linux_conda_py310_cu117_pyt1131
-          python_version: '3.10'
-          pytorch_version: 1.13.1
      - binary_linux_conda:
          conda_docker_image: pytorch/conda-builder:cuda117
          context: DOCKERHUB_TOKEN
--- a/.circleci/regenerate.py
+++ b/.circleci/regenerate.py
@@ -19,10 +19,6 @@ from packaging import version
 # The CUDA versions which have pytorch conda packages available for linux for each
 # version of pytorch.
 CONDA_CUDA_VERSIONS = {
-    "1.12.0": ["cu113", "cu116"],
-    "1.12.1": ["cu113", "cu116"],
-    "1.13.0": ["cu116", "cu117"],
-    "1.13.1": ["cu116", "cu117"],
    "2.0.0": ["cu117", "cu118"],
    "2.0.1": ["cu117", "cu118"],
    "2.1.0": ["cu118", "cu121"],
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -9,7 +9,7 @@ The core library is written in PyTorch. Several components have underlying imple

 - Linux or macOS or Windows
 - Python 3.8, 3.9 or 3.10
- PyTorch 1.12.0, 1.12.1, 1.13.0, 2.0.0, 2.0.1, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1, 2.2.2, 2.3.0 or 2.3.1.
+- PyTorch 2.0.0, 2.0.1, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1, 2.2.2, 2.3.0 or 2.3.1.
 - torchvision that matches the PyTorch installation. You can install them together as explained at pytorch.org to make sure of this.
 - gcc & g++ ≥ 4.9
 - [fvcore](https://github.com/facebookresearch/fvcore)
--- a/packaging/build_conda.py
+++ b/packaging/build_conda.py
@@ -80,6 +80,12 @@ def setup_cuda():
 def setup_conda_pytorch_constraint() -> List[str]:
    pytorch_constraint = f"- pytorch=={PYTORCH_VERSION}"
    os.environ["CONDA_PYTORCH_CONSTRAINT"] = pytorch_constraint
+    if pytorch_major_minor < (2, 2):
+        os.environ["CONDA_PYTORCH_MKL_CONSTRAINT"] = "- mkl!=2024.1.0"
+        os.environ["SETUPTOOLS_CONSTRAINT"] = "- setuptools<70"
+    else:
+        os.environ["CONDA_PYTORCH_MKL_CONSTRAINT"] = ""
+        os.environ["SETUPTOOLS_CONSTRAINT"] = "- setuptools"
    os.environ["CONDA_PYTORCH_BUILD_CONSTRAINT"] = pytorch_constraint
    os.environ["PYTORCH_VERSION_NODOT"] = PYTORCH_VERSION.replace(".", "")

--- a/packaging/pytorch3d/meta.yaml
+++ b/packaging/pytorch3d/meta.yaml
@@ -12,8 +12,9 @@ requirements:

  host:
    - python
-    - setuptools
+    {{ environ.get('SETUPTOOLS_CONSTRAINT') }}
    {{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }}
+    {{ environ.get('CONDA_PYTORCH_MKL_CONSTRAINT') }}
    {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
    {{ environ.get('CONDA_CPUONLY_FEATURE') }}

--- a/pytorch3d/init.py
+++ b/pytorch3d/init.py
@@ -6,4 +6,4 @@

 # pyre-unsafe

-__version__ = "0.7.6"
+__version__ = "0.7.7"
--- a/pytorch3d/implicitron/dataset/frame_data.py
+++ b/pytorch3d/implicitron/dataset/frame_data.py
@@ -434,7 +434,7 @@ class FrameData(Mapping[str, Any]):
            # TODO: don't store K; enforce working in NDC space
            return join_cameras_as_batch(batch)
        else:
-            return torch.utils.data._utils.collate.default_collate(batch)
+            return torch.utils.data.dataloader.default_collate(batch)


 FrameDataSubtype = TypeVar("FrameDataSubtype", bound=FrameData)
Author	SHA1	Message	Date
Jeremy Reizenstein	89653419d0	version 0.7.7 Summary: New version Reviewed By: MichaelRamamonjisoa Differential Revision: D58668979 fbshipit-source-id: 195eaf83e4da51a106ef72e38dbb98c51c51724c	2024-06-25 06:59:24 -07:00
Jeremy Reizenstein	7980854d44	require pytorch 2.0+ Summary: Problems with timeouts on old builds. Reviewed By: MichaelRamamonjisoa Differential Revision: D58819435 fbshipit-source-id: e1976534a102ad3841f3b297c772e916aeea12cb	2024-06-21 08:15:17 -07:00
Jeremy Reizenstein	51d7c06ddd	MKL version fix in CI (#1820 ) Summary: Fix for "undefined symbol: iJIT_NotifyEvent" build issue, Pull Request resolved: https://github.com/facebookresearch/pytorch3d/pull/1820 Reviewed By: MichaelRamamonjisoa Differential Revision: D58685326 fbshipit-source-id: 48b54367c00851cc6fbb111ca98d69a2ace8361b	2024-06-21 08:15:17 -07:00
Sergii Dymchenko	00c36ec01c	Update deprecated PyTorch functions in fbcode/vision Reviewed By: bottler Differential Revision: D58762015 fbshipit-source-id: a0d05fe63a88d33e3f7783b5a7b2a476dd3a7449	2024-06-20 14:06:28 -07:00