From addfbd84fac4c32594fdf692f5e7cf70482cc9ab Mon Sep 17 00:00:00 2001 From: "Nick J. Browning" Date: Mon, 16 Dec 2024 12:02:50 +0100 Subject: [PATCH] review updates. --- .github/workflows/build-jax-wheels.yml | 1 + .github/workflows/build-torch-wheels.yml | 1 + sphericart-jax/pyproject.toml | 2 +- sphericart-torch/pyproject.toml | 2 +- sphericart/include/dynamic_cuda.hpp | 22 ---------------------- 5 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-jax-wheels.yml b/.github/workflows/build-jax-wheels.yml index 8447b5f14..a54530bb1 100644 --- a/.github/workflows/build-jax-wheels.yml +++ b/.github/workflows/build-jax-wheels.yml @@ -20,6 +20,7 @@ jobs: cuda-version: ["12.1"] env: CIBW_SKIP: cp36-* cp37-* cp38-* cp39-* + name: "sphericart-jax-wheel ${{matrix.os}} ${{matrix.arch}} python=${{matrix.python-version}}" steps: - name: Checkout code diff --git a/.github/workflows/build-torch-wheels.yml b/.github/workflows/build-torch-wheels.yml index 7b599f277..8ccb5568a 100644 --- a/.github/workflows/build-torch-wheels.yml +++ b/.github/workflows/build-torch-wheels.yml @@ -21,6 +21,7 @@ jobs: cuda-version: ["12.1"] env: CIBW_SKIP: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* + name: "sphericart-torch-wheel ${{matrix.os}} ${{matrix.arch}} python=${{matrix.python-version}} torch=${{matrix.torch-version}}" steps: - name: Checkout code diff --git a/sphericart-jax/pyproject.toml b/sphericart-jax/pyproject.toml index 564bfe2c8..77928308d 100644 --- a/sphericart-jax/pyproject.toml +++ b/sphericart-jax/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "sphericart-jax" dynamic = ["version"] -requires-python = ">=3.10" +requires-python = ">=3.9" dependencies = ["jax >= 0.4.18"] readme = "README.md" diff --git a/sphericart-torch/pyproject.toml b/sphericart-torch/pyproject.toml index 79c424cc3..ebbb59ef7 100644 --- a/sphericart-torch/pyproject.toml +++ b/sphericart-torch/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "sphericart-torch" -requires-python = ">=3.8" +requires-python = ">=3.9" dynamic = ["version", "dependencies"] readme = "README.md" diff --git a/sphericart/include/dynamic_cuda.hpp b/sphericart/include/dynamic_cuda.hpp index 3ab31dfa1..eda6b1506 100644 --- a/sphericart/include/dynamic_cuda.hpp +++ b/sphericart/include/dynamic_cuda.hpp @@ -366,26 +366,4 @@ static struct CUDAInitializer { } cudaInitializer; -/* -// Singleton getter functions -inline CUDART& GetCUDARTInstance() { - static CUDART instance; - return instance; -} - -inline CUDADriver& GetCUDADriverInstance() { - static CUDADriver instance; - return instance; -} - -inline NVRTC& GetNVRTCInstance() { - static NVRTC instance; - return instance; -} - -// Macro shortcuts -#define CUDART_INSTANCE GetCUDARTInstance() -#define CUDA_DRIVER_INSTANCE GetCUDADriverInstance() -#define NVRTC_INSTANCE GetNVRTCInstance() */ - #endif // DYNAMIC_CUDA_HEADER_HPP \ No newline at end of file