diff --git a/INSTALL.md b/INSTALL.md index 3947e5b1..08e2910b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -12,7 +12,6 @@ The core library is written in PyTorch. Several components have underlying imple - 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) - [ioPath](https://github.com/facebookresearch/iopath) - If CUDA is to be used, use a version which is supported by the corresponding pytorch version and at least version 9.2. - If CUDA older than 11.7 is to be used and you are building from source, the CUB library must be available. We recommend version 1.10.0. @@ -22,7 +21,7 @@ The runtime dependencies can be installed by running: conda create -n pytorch3d python=3.9 conda activate pytorch3d conda install pytorch=1.13.0 torchvision pytorch-cuda=11.6 -c pytorch -c nvidia -conda install -c fvcore -c iopath -c conda-forge fvcore iopath +conda install -c iopath iopath ``` For the CUB build time dependency, which you only need if you have CUDA older than 11.7, if you are using conda, you can continue with @@ -49,6 +48,7 @@ For developing on top of PyTorch3D or contributing, you will need to run the lin - tdqm - jupyter - imageio +- fvcore - plotly - opencv-python @@ -59,6 +59,7 @@ conda install jupyter pip install scikit-image matplotlib imageio plotly opencv-python # Tests/Linting +conda install -c fvcore -c conda-forge fvcore pip install black usort flake8 flake8-bugbear flake8-comprehensions ``` @@ -97,7 +98,7 @@ version_str="".join([ torch.version.cuda.replace(".",""), f"_pyt{pyt_version_str}" ]) -!pip install fvcore iopath +!pip install iopath !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html ``` diff --git a/dev/run_tutorials.sh b/dev/run_tutorials.sh index 304e471b..7517ea8c 100644 --- a/dev/run_tutorials.sh +++ b/dev/run_tutorials.sh @@ -23,7 +23,7 @@ conda init bash source ~/.bashrc conda create -y -n myenv python=3.8 matplotlib ipython ipywidgets nbconvert conda activate myenv -conda install -y -c fvcore -c iopath -c conda-forge fvcore iopath +conda install -y -c iopath iopath conda install -y -c pytorch pytorch=1.6.0 cudatoolkit=10.1 torchvision conda install -y -c pytorch3d-nightly pytorch3d pip install plotly scikit-image diff --git a/docs/requirements.txt b/docs/requirements.txt index 577a18a9..a85a5e6e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -5,7 +5,6 @@ sphinx_rtd_theme sphinx_markdown_tables numpy iopath -fvcore https://download.pytorch.org/whl/cpu/torchvision-0.15.2%2Bcpu-cp311-cp311-linux_x86_64.whl https://download.pytorch.org/whl/cpu/torch-2.0.1%2Bcpu-cp311-cp311-linux_x86_64.whl omegaconf diff --git a/docs/tutorials/bundle_adjustment.ipynb b/docs/tutorials/bundle_adjustment.ipynb index 04b2b60b..1e948d93 100644 --- a/docs/tutorials/bundle_adjustment.ipynb +++ b/docs/tutorials/bundle_adjustment.ipynb @@ -96,7 +96,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/docs/tutorials/camera_position_optimization_with_differentiable_rendering.ipynb b/docs/tutorials/camera_position_optimization_with_differentiable_rendering.ipynb index e230ba52..55b21e5b 100644 --- a/docs/tutorials/camera_position_optimization_with_differentiable_rendering.ipynb +++ b/docs/tutorials/camera_position_optimization_with_differentiable_rendering.ipynb @@ -83,7 +83,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/docs/tutorials/dataloaders_ShapeNetCore_R2N2.ipynb b/docs/tutorials/dataloaders_ShapeNetCore_R2N2.ipynb index 8055b286..15eb07d9 100644 --- a/docs/tutorials/dataloaders_ShapeNetCore_R2N2.ipynb +++ b/docs/tutorials/dataloaders_ShapeNetCore_R2N2.ipynb @@ -58,7 +58,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/docs/tutorials/deform_source_mesh_to_target_mesh.ipynb b/docs/tutorials/deform_source_mesh_to_target_mesh.ipynb index 6f536f5b..70d0fd0f 100644 --- a/docs/tutorials/deform_source_mesh_to_target_mesh.ipynb +++ b/docs/tutorials/deform_source_mesh_to_target_mesh.ipynb @@ -97,7 +97,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/docs/tutorials/fit_simple_neural_radiance_field.ipynb b/docs/tutorials/fit_simple_neural_radiance_field.ipynb index 54665050..639690c9 100644 --- a/docs/tutorials/fit_simple_neural_radiance_field.ipynb +++ b/docs/tutorials/fit_simple_neural_radiance_field.ipynb @@ -63,7 +63,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/docs/tutorials/fit_textured_mesh.ipynb b/docs/tutorials/fit_textured_mesh.ipynb index 7813150b..e09bb8db 100644 --- a/docs/tutorials/fit_textured_mesh.ipynb +++ b/docs/tutorials/fit_textured_mesh.ipynb @@ -75,7 +75,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/docs/tutorials/fit_textured_volume.ipynb b/docs/tutorials/fit_textured_volume.ipynb index cc147925..266521d2 100644 --- a/docs/tutorials/fit_textured_volume.ipynb +++ b/docs/tutorials/fit_textured_volume.ipynb @@ -54,7 +54,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/docs/tutorials/implicitron_config_system.ipynb b/docs/tutorials/implicitron_config_system.ipynb index 2745b205..b433c42d 100644 --- a/docs/tutorials/implicitron_config_system.ipynb +++ b/docs/tutorials/implicitron_config_system.ipynb @@ -85,7 +85,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/docs/tutorials/implicitron_volumes.ipynb b/docs/tutorials/implicitron_volumes.ipynb index e1ff0d71..7035fe9a 100644 --- a/docs/tutorials/implicitron_volumes.ipynb +++ b/docs/tutorials/implicitron_volumes.ipynb @@ -79,7 +79,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/docs/tutorials/render_colored_points.ipynb b/docs/tutorials/render_colored_points.ipynb index 3e3eadd1..4c1812c5 100644 --- a/docs/tutorials/render_colored_points.ipynb +++ b/docs/tutorials/render_colored_points.ipynb @@ -57,7 +57,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/docs/tutorials/render_densepose.ipynb b/docs/tutorials/render_densepose.ipynb index 36b4388a..f02ccd89 100644 --- a/docs/tutorials/render_densepose.ipynb +++ b/docs/tutorials/render_densepose.ipynb @@ -64,7 +64,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/docs/tutorials/render_textured_meshes.ipynb b/docs/tutorials/render_textured_meshes.ipynb index 5cf36189..a119171a 100644 --- a/docs/tutorials/render_textured_meshes.ipynb +++ b/docs/tutorials/render_textured_meshes.ipynb @@ -80,7 +80,7 @@ " torch.version.cuda.replace(\".\",\"\"),\n", " f\"_pyt{pyt_version_str}\"\n", " ])\n", - " !pip install fvcore iopath\n", + " !pip install iopath\n", " if sys.platform.startswith(\"linux\"):\n", " print(\"Trying to install wheel for PyTorch3D\")\n", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n", diff --git a/packaging/build_conda.py b/packaging/build_conda.py index da01967e..554e86c6 100644 --- a/packaging/build_conda.py +++ b/packaging/build_conda.py @@ -123,7 +123,7 @@ def do_build(start_args: List[str]): if test_flag is not None: args.append(test_flag) - args.extend(["-c", "bottler", "-c", "fvcore", "-c", "iopath", "-c", "conda-forge"]) + args.extend(["-c", "bottler", "-c", "iopath", "-c", "conda-forge"]) args.append("--no-anaconda-upload") args.extend(["--python", os.environ["PYTHON_VERSION"]]) args.append("packaging/pytorch3d") diff --git a/packaging/linux_wheels/README.md b/packaging/linux_wheels/README.md index d8871ffb..172aabf0 100644 --- a/packaging/linux_wheels/README.md +++ b/packaging/linux_wheels/README.md @@ -26,6 +26,6 @@ version_str="".join([ torch.version.cuda.replace(".",""), f"_pyt{pyt_version_str}" ]) -!pip install fvcore iopath +!pip install iopath !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html ``` diff --git a/packaging/linux_wheels/inside.sh b/packaging/linux_wheels/inside.sh index a7b8951a..8c7a718d 100644 --- a/packaging/linux_wheels/inside.sh +++ b/packaging/linux_wheels/inside.sh @@ -144,7 +144,7 @@ do conda activate "$tag" # shellcheck disable=SC2086 conda install -y -c pytorch $extra_channel "pytorch=$pytorch_version" "$cudatools=$CUDA_TAG" - pip install fvcore iopath + pip install iopath echo "python version" "$python_version" "pytorch version" "$pytorch_version" "cuda version" "$cu_version" "tag" "$tag" rm -rf dist diff --git a/packaging/pytorch3d/meta.yaml b/packaging/pytorch3d/meta.yaml index fb7482ec..9f115ff9 100644 --- a/packaging/pytorch3d/meta.yaml +++ b/packaging/pytorch3d/meta.yaml @@ -22,7 +22,6 @@ requirements: - python - numpy >=1.11 - torchvision >=0.5 - - fvcore - iopath {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} diff --git a/setup.py b/setup.py index a5aecf71..eddbddb4 100755 --- a/setup.py +++ b/setup.py @@ -153,7 +153,7 @@ setup( ) + [trainer], package_dir={trainer: "projects/implicitron_trainer"}, - install_requires=["fvcore", "iopath"], + install_requires=["iopath"], extras_require={ "all": ["matplotlib", "tqdm>4.29.0", "imageio", "ipywidgets"], "dev": ["flake8", "usort"],