Skip to content

Commit

Permalink
Update metatensor
Browse files Browse the repository at this point in the history
  • Loading branch information
Luthaf committed Oct 6, 2023
1 parent 45251d6 commit d9c032b
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ myst-parser # markdown => rst translation, used in extensions/rascaline_json

# dependencies for the tutorials
--extra-index-url https://download.pytorch.org/whl/cpu
metatensor[torch] @ https://github.com/lab-cosmo/metatensor/archive/2248a3c.zip
metatensor[torch] @ https://github.com/lab-cosmo/metatensor/archive/ae10944.zip
torch
chemfiles
matplotlib
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
]

dependencies = [
"metatensor-core @ https://github.com/lab-cosmo/metatensor/archive/2248a3c.zip#subdirectory=python/metatensor-core",
"metatensor-core @ git+https://github.com/lab-cosmo/metatensor@ae10944#subdirectory=python/metatensor-core",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion python/rascaline-torch/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ requires = [
"wheel >=0.38",
"cmake",
"torch >= 1.11",
"metatensor-torch @ https://github.com/lab-cosmo/metatensor/archive/2248a3c.zip#subdirectory=python/metatensor-torch",
"metatensor-torch @ https://github.com/lab-cosmo/metatensor/archive/ae10944.zip#subdirectory=python/metatensor-torch",
]

# use a custom build backend to add a dependency on the right version of rascaline
Expand Down
4 changes: 2 additions & 2 deletions rascaline-c-api/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ endif()
# ============================================================================ #
# Setup metatensor

set(METATENSOR_GIT_VERSION "2248a3c")
set(METATENSOR_GIT_VERSION "ae10944")
set(METATENSOR_REQUIRED_VERSION "0.1")
if (RASCALINE_FETCH_METATENSOR)
message(STATUS "Fetching metatensor @ ${METATENSOR_GIT_VERSION} from github")
Expand All @@ -226,7 +226,7 @@ if (RASCALINE_FETCH_METATENSOR)
FetchContent_Declare(
metatensor
URL https://github.com/lab-cosmo/metatensor/archive/${METATENSOR_GIT_VERSION}.zip
URL_HASH MD5=50e70a2e74246a985e1520260a74205c
URL_HASH MD5=1de1208bd96fa9acda0b835d1c9e2c5d
SOURCE_SUBDIR metatensor-core
VERBOSE
)
Expand Down
4 changes: 2 additions & 2 deletions rascaline-c-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ chemfiles = ["rascaline/chemfiles"]

[dependencies]
rascaline = {path = "../rascaline", version = "0.1.0", default-features = false}
metatensor = {git = "https://github.com/lab-cosmo/metatensor", rev = "2248a3c"}
metatensor = {git = "https://github.com/lab-cosmo/metatensor", rev = "ae10944"}

ndarray = "0.15"
log = { version = "0.4", features = ["std"] }
Expand All @@ -29,7 +29,7 @@ libc = "0.2"
[build-dependencies]
cbindgen = { version = "0.24", default-features = false }
fs_extra = "1"
metatensor = {git = "https://github.com/lab-cosmo/metatensor", rev = "2248a3c"}
metatensor = {git = "https://github.com/lab-cosmo/metatensor", rev = "ae10944"}

[dev-dependencies]
which = "4"
4 changes: 2 additions & 2 deletions rascaline-torch/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ find_package(Torch 1.11 REQUIRED)
# ============================================================================ #
# Setup metatensor_torch

set(METATENSOR_GIT_VERSION "2248a3c")
set(METATENSOR_GIT_VERSION "ae10944")
set(REQUIRED_METATENSOR_TORCH_VERSION "0.1")
if (RASCALINE_TORCH_FETCH_METATENSOR_TORCH)
message(STATUS "Fetching metatensor_torch @ ${METATENSOR_GIT_VERSION} from github")
Expand All @@ -67,7 +67,7 @@ if (RASCALINE_TORCH_FETCH_METATENSOR_TORCH)
FetchContent_Declare(
metatensor_torch
URL https://github.com/lab-cosmo/metatensor/archive/${METATENSOR_GIT_VERSION}.zip
URL_HASH MD5=50e70a2e74246a985e1520260a74205c
URL_HASH MD5=1de1208bd96fa9acda0b835d1c9e2c5d
SOURCE_SUBDIR metatensor-torch
VERBOSE
)
Expand Down
2 changes: 1 addition & 1 deletion rascaline/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ name = "soap-power-spectrum"
harness = false

[dependencies]
metatensor = {git = "https://github.com/lab-cosmo/metatensor", rev = "2248a3c", features = ["rayon"]}
metatensor = {git = "https://github.com/lab-cosmo/metatensor", rev = "ae10944", features = ["rayon"]}

ndarray = {version = "0.15", features = ["approx-0_5", "rayon", "serde"]}
num-traits = "0.2"
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ lint-folders = "{toxinidir}/python" "{toxinidir}/setup.py"
# we need to manually install dependencies for rascaline, since tox will install
# the fresh wheel with `--no-deps` after building it.
metatensor-core-requirement =
metatensor-core @ https://github.com/lab-cosmo/metatensor/archive/2248a3c.zip\#subdirectory=python/metatensor-core
metatensor-core @ git+https://github.com/lab-cosmo/metatensor@ae10944\#subdirectory=python/metatensor-core

metatensor-torch-requirement =
metatensor-torch @ https://github.com/lab-cosmo/metatensor/archive/2248a3c.zip\#subdirectory=python/metatensor-torch
metatensor-torch @ git+https://github.com/lab-cosmo/metatensor@ae10944\#subdirectory=python/metatensor-torch

build-single-wheel = --no-deps --no-build-isolation --check-build-dependencies

Expand Down

0 comments on commit d9c032b

Please sign in to comment.