PyTorch>1.9 version str

Summary: Make code for downloading linux wheels robust to double-digit PyTorch minor version. Reviewed By: nikhilaravi Differential Revision: D33170562 fbshipit-source-id: 559a97cc98ff8411e235a9f9e29f84b7a400c716
facebookresearch · Dec 18, 2021 · 1152a93 · 1152a93
1 parent 315f248
commit 1152a93
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 12 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -96,10 +96,11 @@ In general, from inside IPython, or in Google Colab or a jupyter notebook, you c
 ```
 import sys
 import torch
+pyt_version_str=torch.__version__.split("+")[0].replace(".", "")
 version_str="".join([
     f"py3{sys.version_info.minor}_cu",
     torch.version.cuda.replace(".",""),
-    f"_pyt{torch.__version__[0:5:2]}"
+    f"_pyt{pyt_version_str}"
 ])
 !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html
 ```

diff --git a/docs/tutorials/bundle_adjustment.ipynb b/docs/tutorials/bundle_adjustment.ipynb
@@ -91,10 +91,11 @@
     "if need_pytorch3d:\n",
     "    if torch.__version__.startswith(\"1.10.\") and sys.platform.startswith(\"linux\"):\n",
     "        # We try to install PyTorch3D via a released wheel.\n",
+    "        pyt_version_str=torch.__version__.split(\"+\")[0].replace(\".\", \"\")\n",
     "        version_str=\"\".join([\n",
     "            f\"py3{sys.version_info.minor}_cu\",\n",
     "            torch.version.cuda.replace(\".\",\"\"),\n",
-    "            f\"_pyt{torch.__version__[0:5:2]}\"\n",
+    "            f\"_pyt{pyt_version_str}\"\n",
     "        ])\n",
     "        !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
     "    else:\n",

diff --git a/docs/tutorials/camera_position_optimization_with_differentiable_rendering.ipynb b/docs/tutorials/camera_position_optimization_with_differentiable_rendering.ipynb
@@ -78,10 +78,11 @@
     "if need_pytorch3d:\n",
     "    if torch.__version__.startswith(\"1.10.\") and sys.platform.startswith(\"linux\"):\n",
     "        # We try to install PyTorch3D via a released wheel.\n",
+    "        pyt_version_str=torch.__version__.split(\"+\")[0].replace(\".\", \"\")\n",
     "        version_str=\"\".join([\n",
     "            f\"py3{sys.version_info.minor}_cu\",\n",
     "            torch.version.cuda.replace(\".\",\"\"),\n",
-    "            f\"_pyt{torch.__version__[0:5:2]}\"\n",
+    "            f\"_pyt{pyt_version_str}\"\n",
     "        ])\n",
     "        !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
     "    else:\n",

diff --git a/docs/tutorials/dataloaders_ShapeNetCore_R2N2.ipynb b/docs/tutorials/dataloaders_ShapeNetCore_R2N2.ipynb
@@ -53,10 +53,11 @@
     "if need_pytorch3d:\n",
     "    if torch.__version__.startswith(\"1.10.\") and sys.platform.startswith(\"linux\"):\n",
     "        # We try to install PyTorch3D via a released wheel.\n",
+    "        pyt_version_str=torch.__version__.split(\"+\")[0].replace(\".\", \"\")\n",
     "        version_str=\"\".join([\n",
     "            f\"py3{sys.version_info.minor}_cu\",\n",
     "            torch.version.cuda.replace(\".\",\"\"),\n",
-    "            f\"_pyt{torch.__version__[0:5:2]}\"\n",
+    "            f\"_pyt{pyt_version_str}\"\n",
     "        ])\n",
     "        !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
     "    else:\n",

diff --git a/docs/tutorials/deform_source_mesh_to_target_mesh.ipynb b/docs/tutorials/deform_source_mesh_to_target_mesh.ipynb
@@ -92,10 +92,11 @@
     "if need_pytorch3d:\n",
     "    if torch.__version__.startswith(\"1.10.\") and sys.platform.startswith(\"linux\"):\n",
     "        # We try to install PyTorch3D via a released wheel.\n",
+    "        pyt_version_str=torch.__version__.split(\"+\")[0].replace(\".\", \"\")\n",
     "        version_str=\"\".join([\n",
     "            f\"py3{sys.version_info.minor}_cu\",\n",
     "            torch.version.cuda.replace(\".\",\"\"),\n",
-    "            f\"_pyt{torch.__version__[0:5:2]}\"\n",
+    "            f\"_pyt{pyt_version_str}\"\n",
     "        ])\n",
     "        !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
     "    else:\n",

diff --git a/docs/tutorials/fit_simple_neural_radiance_field.ipynb b/docs/tutorials/fit_simple_neural_radiance_field.ipynb
@@ -58,10 +58,11 @@
     "if need_pytorch3d:\n",
     "    if torch.__version__.startswith(\"1.10.\") and sys.platform.startswith(\"linux\"):\n",
     "        # We try to install PyTorch3D via a released wheel.\n",
+    "        pyt_version_str=torch.__version__.split(\"+\")[0].replace(\".\", \"\")\n",
     "        version_str=\"\".join([\n",
     "            f\"py3{sys.version_info.minor}_cu\",\n",
     "            torch.version.cuda.replace(\".\",\"\"),\n",
-    "            f\"_pyt{torch.__version__[0:5:2]}\"\n",
+    "            f\"_pyt{pyt_version_str}\"\n",
     "        ])\n",
     "        !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
     "    else:\n",

diff --git a/docs/tutorials/fit_textured_mesh.ipynb b/docs/tutorials/fit_textured_mesh.ipynb
@@ -70,10 +70,11 @@
     "if need_pytorch3d:\n",
     "    if torch.__version__.startswith(\"1.10.\") and sys.platform.startswith(\"linux\"):\n",
     "        # We try to install PyTorch3D via a released wheel.\n",
+    "        pyt_version_str=torch.__version__.split(\"+\")[0].replace(\".\", \"\")\n",
     "        version_str=\"\".join([\n",
     "            f\"py3{sys.version_info.minor}_cu\",\n",
     "            torch.version.cuda.replace(\".\",\"\"),\n",
-    "            f\"_pyt{torch.__version__[0:5:2]}\"\n",
+    "            f\"_pyt{pyt_version_str}\"\n",
     "        ])\n",
     "        !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
     "    else:\n",

diff --git a/docs/tutorials/fit_textured_volume.ipynb b/docs/tutorials/fit_textured_volume.ipynb
@@ -49,10 +49,11 @@
     "if need_pytorch3d:\n",
     "    if torch.__version__.startswith(\"1.10.\") and sys.platform.startswith(\"linux\"):\n",
     "        # We try to install PyTorch3D via a released wheel.\n",
+    "        pyt_version_str=torch.__version__.split(\"+\")[0].replace(\".\", \"\")\n",
     "        version_str=\"\".join([\n",
     "            f\"py3{sys.version_info.minor}_cu\",\n",
     "            torch.version.cuda.replace(\".\",\"\"),\n",
-    "            f\"_pyt{torch.__version__[0:5:2]}\"\n",
+    "            f\"_pyt{pyt_version_str}\"\n",
     "        ])\n",
     "        !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
     "    else:\n",

diff --git a/docs/tutorials/render_colored_points.ipynb b/docs/tutorials/render_colored_points.ipynb
@@ -52,10 +52,11 @@
     "if need_pytorch3d:\n",
     "    if torch.__version__.startswith(\"1.10.\") and sys.platform.startswith(\"linux\"):\n",
     "        # We try to install PyTorch3D via a released wheel.\n",
+    "        pyt_version_str=torch.__version__.split(\"+\")[0].replace(\".\", \"\")\n",
     "        version_str=\"\".join([\n",
     "            f\"py3{sys.version_info.minor}_cu\",\n",
     "            torch.version.cuda.replace(\".\",\"\"),\n",
-    "            f\"_pyt{torch.__version__[0:5:2]}\"\n",
+    "            f\"_pyt{pyt_version_str}\"\n",
     "        ])\n",
     "        !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
     "    else:\n",

diff --git a/docs/tutorials/render_densepose.ipynb b/docs/tutorials/render_densepose.ipynb
@@ -59,10 +59,11 @@
     "if need_pytorch3d:\n",
     "    if torch.__version__.startswith(\"1.10.\") and sys.platform.startswith(\"linux\"):\n",
     "        # We try to install PyTorch3D via a released wheel.\n",
+    "        pyt_version_str=torch.__version__.split(\"+\")[0].replace(\".\", \"\")\n",
     "        version_str=\"\".join([\n",
     "            f\"py3{sys.version_info.minor}_cu\",\n",
     "            torch.version.cuda.replace(\".\",\"\"),\n",
-    "            f\"_pyt{torch.__version__[0:5:2]}\"\n",
+    "            f\"_pyt{pyt_version_str}\"\n",
     "        ])\n",
     "        !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
     "    else:\n",

diff --git a/docs/tutorials/render_textured_meshes.ipynb b/docs/tutorials/render_textured_meshes.ipynb
@@ -75,10 +75,11 @@
     "if need_pytorch3d:\n",
     "    if torch.__version__.startswith(\"1.10.\") and sys.platform.startswith(\"linux\"):\n",
     "        # We try to install PyTorch3D via a released wheel.\n",
+    "        pyt_version_str=torch.__version__.split(\"+\")[0].replace(\".\", \"\")\n",
     "        version_str=\"\".join([\n",
     "            f\"py3{sys.version_info.minor}_cu\",\n",
     "            torch.version.cuda.replace(\".\",\"\"),\n",
-    "            f\"_pyt{torch.__version__[0:5:2]}\"\n",
+    "            f\"_pyt{pyt_version_str}\"\n",
     "        ])\n",
     "        !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html\n",
     "    else:\n",

diff --git a/packaging/linux_wheels/README.md b/packaging/linux_wheels/README.md
@@ -20,10 +20,11 @@ commands.
 ```
 import sys
 import torch
+pyt_version_str=torch.__version__.split("+")[0].replace(".", "")
 version_str="".join([
     f"py3{sys.version_info.minor}_cu",
     torch.version.cuda.replace(".",""),
-    f"_pyt{torch.__version__[0:5:2]}"
+    f"_pyt{pyt_version_str}"
 ])
 !pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/{version_str}/download.html
 ```