From f12e781205dd4cc3847e6494581ed642ac28776e Mon Sep 17 00:00:00 2001 From: Martin de La Gorce Date: Thu, 22 Aug 2024 15:46:46 +0100 Subject: [PATCH 1/5] testing --- environment.yml | 15 +++++++++++++++ requirements.txt | 6 ++++++ setup.py | 5 +++++ 3 files changed, 26 insertions(+) create mode 100644 environment.yml create mode 100644 requirements.txt diff --git a/environment.yml b/environment.yml new file mode 100644 index 000000000..1b614db2b --- /dev/null +++ b/environment.yml @@ -0,0 +1,15 @@ +name: gsplat4 +channels: + - pytorch + - defaults + - nvidia/label/cuda-11.8.0 + - conda-forge +dependencies: + - python=3.10 + - cuda-version==11.8 + - cudnn==8.9.7.29 + - cuda-toolkit=11.8 + - pip: + - r requirements.txt +variables: + CUDA_PATH: "" \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..129fe730a --- /dev/null +++ b/requirements.txt @@ -0,0 +1,6 @@ +--no-cache-dir +-f https://download.pytorch.org/whl/torch_stable.html +torch==2.0.0+cu118 +gsplat +numpy==1.26.4 +--no-binary==gsplat diff --git a/setup.py b/setup.py index 3ea2dfe33..63d70ed8e 100644 --- a/setup.py +++ b/setup.py @@ -127,6 +127,11 @@ def get_extensions(): url=URL, download_url=f"{URL}/archive/gsplat-{__version__}.tar.gz", python_requires=">=3.7", + setup_requires=[ + "ninja", + "numpy", + "torch", + ], install_requires=[ "ninja", "numpy", From b059f28d8d838de0c5aa15bcd718fb326547992a Mon Sep 17 00:00:00 2001 From: Martin de La Gorce Date: Thu, 22 Aug 2024 17:05:53 +0100 Subject: [PATCH 2/5] adding pyproject.toml with build-system --- environment.yml | 4 ++-- pyproject.toml | 3 +++ requirements.txt | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 pyproject.toml diff --git a/environment.yml b/environment.yml index 1b614db2b..e01f66a7d 100644 --- a/environment.yml +++ b/environment.yml @@ -1,4 +1,4 @@ -name: gsplat4 +name: gsplat9 channels: - pytorch - defaults @@ -10,6 +10,6 @@ dependencies: - cudnn==8.9.7.29 - cuda-toolkit=11.8 - pip: - - r requirements.txt + - -r requirements.txt variables: CUDA_PATH: "" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..7b75d3e3a --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = ["setuptools", "wheel", "torch", "numpy==1.26.4"] # PEP 508 specifications. \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 129fe730a..4354c6f4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ ---no-cache-dir -f https://download.pytorch.org/whl/torch_stable.html torch==2.0.0+cu118 -gsplat +-e . numpy==1.26.4 --no-binary==gsplat From 98d1391962dd52ced93249847118fc40ad6f5c57 Mon Sep 17 00:00:00 2001 From: Martin de La Gorce Date: Fri, 23 Aug 2024 11:42:39 +0100 Subject: [PATCH 3/5] cleaning PR --- pyproject.toml | 3 --- requirements.txt | 5 ----- setup.py | 5 ----- 3 files changed, 13 deletions(-) delete mode 100644 pyproject.toml delete mode 100644 requirements.txt diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 7b75d3e3a..000000000 --- a/pyproject.toml +++ /dev/null @@ -1,3 +0,0 @@ -[build-system] -# Minimum requirements for the build system to execute. -requires = ["setuptools", "wheel", "torch", "numpy==1.26.4"] # PEP 508 specifications. \ No newline at end of file diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 4354c6f4b..000000000 --- a/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ --f https://download.pytorch.org/whl/torch_stable.html -torch==2.0.0+cu118 --e . -numpy==1.26.4 ---no-binary==gsplat diff --git a/setup.py b/setup.py index 63d70ed8e..3ea2dfe33 100644 --- a/setup.py +++ b/setup.py @@ -127,11 +127,6 @@ def get_extensions(): url=URL, download_url=f"{URL}/archive/gsplat-{__version__}.tar.gz", python_requires=">=3.7", - setup_requires=[ - "ninja", - "numpy", - "torch", - ], install_requires=[ "ninja", "numpy", From 58af2402cc43df7912bc2ac7914033bf54670d11 Mon Sep 17 00:00:00 2001 From: Martin de La Gorce Date: Fri, 23 Aug 2024 11:44:50 +0100 Subject: [PATCH 4/5] Revert "cleaning PR" This reverts commit 98d1391962dd52ced93249847118fc40ad6f5c57. --- pyproject.toml | 3 +++ requirements.txt | 5 +++++ setup.py | 5 +++++ 3 files changed, 13 insertions(+) create mode 100644 pyproject.toml create mode 100644 requirements.txt diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..7b75d3e3a --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = ["setuptools", "wheel", "torch", "numpy==1.26.4"] # PEP 508 specifications. \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..4354c6f4b --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +-f https://download.pytorch.org/whl/torch_stable.html +torch==2.0.0+cu118 +-e . +numpy==1.26.4 +--no-binary==gsplat diff --git a/setup.py b/setup.py index 3ea2dfe33..63d70ed8e 100644 --- a/setup.py +++ b/setup.py @@ -127,6 +127,11 @@ def get_extensions(): url=URL, download_url=f"{URL}/archive/gsplat-{__version__}.tar.gz", python_requires=">=3.7", + setup_requires=[ + "ninja", + "numpy", + "torch", + ], install_requires=[ "ninja", "numpy", From b07fcb01d6b1dd524fd832906771c18713db1fae Mon Sep 17 00:00:00 2001 From: Martin de La Gorce Date: Fri, 23 Aug 2024 11:48:35 +0100 Subject: [PATCH 5/5] cleaning PR --- environment.yml | 15 --------------- requirements.txt | 5 ----- setup.py | 5 ----- 3 files changed, 25 deletions(-) delete mode 100644 environment.yml delete mode 100644 requirements.txt diff --git a/environment.yml b/environment.yml deleted file mode 100644 index e01f66a7d..000000000 --- a/environment.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: gsplat9 -channels: - - pytorch - - defaults - - nvidia/label/cuda-11.8.0 - - conda-forge -dependencies: - - python=3.10 - - cuda-version==11.8 - - cudnn==8.9.7.29 - - cuda-toolkit=11.8 - - pip: - - -r requirements.txt -variables: - CUDA_PATH: "" \ No newline at end of file diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 4354c6f4b..000000000 --- a/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ --f https://download.pytorch.org/whl/torch_stable.html -torch==2.0.0+cu118 --e . -numpy==1.26.4 ---no-binary==gsplat diff --git a/setup.py b/setup.py index 63d70ed8e..3ea2dfe33 100644 --- a/setup.py +++ b/setup.py @@ -127,11 +127,6 @@ def get_extensions(): url=URL, download_url=f"{URL}/archive/gsplat-{__version__}.tar.gz", python_requires=">=3.7", - setup_requires=[ - "ninja", - "numpy", - "torch", - ], install_requires=[ "ninja", "numpy",