Commit 4df110b0 authored by Jeremy Reizenstein's avatar Jeremy Reizenstein Committed by Facebook GitHub Bot
Browse files

remove fvcore dependency

Summary: This is not actually needed and is causing a conda-forge confusion to do with python_abi - which needs users to have `-c conda-forge` when they install pytorch3d.

Reviewed By: patricklabatut

Differential Revision: D59587930

fbshipit-source-id: 961ae13a62e1b2b2ce6d8781db38bd97eca69e65
parent 51fd114d
...@@ -12,7 +12,6 @@ The core library is written in PyTorch. Several components have underlying imple ...@@ -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. - 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. - 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 - gcc & g++ ≥ 4.9
- [fvcore](https://github.com/facebookresearch/fvcore)
- [ioPath](https://github.com/facebookresearch/iopath) - [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 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. - 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: ...@@ -22,7 +21,7 @@ The runtime dependencies can be installed by running:
conda create -n pytorch3d python=3.9 conda create -n pytorch3d python=3.9
conda activate pytorch3d conda activate pytorch3d
conda install pytorch=1.13.0 torchvision pytorch-cuda=11.6 -c pytorch -c nvidia 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 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 ...@@ -49,6 +48,7 @@ For developing on top of PyTorch3D or contributing, you will need to run the lin
- tdqm - tdqm
- jupyter - jupyter
- imageio - imageio
- fvcore
- plotly - plotly
- opencv-python - opencv-python
...@@ -59,6 +59,7 @@ conda install jupyter ...@@ -59,6 +59,7 @@ conda install jupyter
pip install scikit-image matplotlib imageio plotly opencv-python pip install scikit-image matplotlib imageio plotly opencv-python
# Tests/Linting # Tests/Linting
conda install -c fvcore -c conda-forge fvcore
pip install black usort flake8 flake8-bugbear flake8-comprehensions pip install black usort flake8 flake8-bugbear flake8-comprehensions
``` ```
...@@ -97,7 +98,7 @@ version_str="".join([ ...@@ -97,7 +98,7 @@ version_str="".join([
torch.version.cuda.replace(".",""), torch.version.cuda.replace(".",""),
f"_pyt{pyt_version_str}" 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 !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html
``` ```
......
...@@ -23,7 +23,7 @@ conda init bash ...@@ -23,7 +23,7 @@ conda init bash
source ~/.bashrc source ~/.bashrc
conda create -y -n myenv python=3.8 matplotlib ipython ipywidgets nbconvert conda create -y -n myenv python=3.8 matplotlib ipython ipywidgets nbconvert
conda activate myenv 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 pytorch pytorch=1.6.0 cudatoolkit=10.1 torchvision
conda install -y -c pytorch3d-nightly pytorch3d conda install -y -c pytorch3d-nightly pytorch3d
pip install plotly scikit-image pip install plotly scikit-image
......
...@@ -5,7 +5,6 @@ sphinx_rtd_theme ...@@ -5,7 +5,6 @@ sphinx_rtd_theme
sphinx_markdown_tables sphinx_markdown_tables
numpy numpy
iopath 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/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 https://download.pytorch.org/whl/cpu/torch-2.0.1%2Bcpu-cp311-cp311-linux_x86_64.whl
omegaconf omegaconf
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
" torch.version.cuda.replace(\".\",\"\"),\n", " torch.version.cuda.replace(\".\",\"\"),\n",
" f\"_pyt{pyt_version_str}\"\n", " f\"_pyt{pyt_version_str}\"\n",
" ])\n", " ])\n",
" !pip install fvcore iopath\n", " !pip install iopath\n",
" if sys.platform.startswith(\"linux\"):\n", " if sys.platform.startswith(\"linux\"):\n",
" print(\"Trying to install wheel for PyTorch3D\")\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", " !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
......
...@@ -123,7 +123,7 @@ def do_build(start_args: List[str]): ...@@ -123,7 +123,7 @@ def do_build(start_args: List[str]):
if test_flag is not None: if test_flag is not None:
args.append(test_flag) 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.append("--no-anaconda-upload")
args.extend(["--python", os.environ["PYTHON_VERSION"]]) args.extend(["--python", os.environ["PYTHON_VERSION"]])
args.append("packaging/pytorch3d") args.append("packaging/pytorch3d")
......
...@@ -26,6 +26,6 @@ version_str="".join([ ...@@ -26,6 +26,6 @@ version_str="".join([
torch.version.cuda.replace(".",""), torch.version.cuda.replace(".",""),
f"_pyt{pyt_version_str}" 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 !pip install --no-index --no-cache-dir pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html
``` ```
...@@ -144,7 +144,7 @@ do ...@@ -144,7 +144,7 @@ do
conda activate "$tag" conda activate "$tag"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
conda install -y -c pytorch $extra_channel "pytorch=$pytorch_version" "$cudatools=$CUDA_TAG" 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" echo "python version" "$python_version" "pytorch version" "$pytorch_version" "cuda version" "$cu_version" "tag" "$tag"
rm -rf dist rm -rf dist
......
...@@ -22,7 +22,6 @@ requirements: ...@@ -22,7 +22,6 @@ requirements:
- python - python
- numpy >=1.11 - numpy >=1.11
- torchvision >=0.5 - torchvision >=0.5
- fvcore
- iopath - iopath
{{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
......
...@@ -153,7 +153,7 @@ setup( ...@@ -153,7 +153,7 @@ setup(
) )
+ [trainer], + [trainer],
package_dir={trainer: "projects/implicitron_trainer"}, package_dir={trainer: "projects/implicitron_trainer"},
install_requires=["fvcore", "iopath"], install_requires=["iopath"],
extras_require={ extras_require={
"all": ["matplotlib", "tqdm>4.29.0", "imageio", "ipywidgets"], "all": ["matplotlib", "tqdm>4.29.0", "imageio", "ipywidgets"],
"dev": ["flake8", "usort"], "dev": ["flake8", "usort"],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment