featomic-torch 0.6.2__py3-none-win_amd64.whl → 0.7.1__py3-none-win_amd64.whl

featomic/torch/_build_versions.py

@@ -2,4 +2,4 @@
 
 
 # version of featomic used when compiling this package
-BUILD_FEATOMIC_VERSION = '0.6.1'
+BUILD_FEATOMIC_VERSION = '0.6.2'

featomic/torch/_c_lib.py

@@ -5,6 +5,7 @@ import sys
 from collections import namedtuple
 
 import metatensor.torch
+import metatomic.torch
 import torch
 
 import featomic
@@ -128,9 +129,10 @@ def _check_dll(path):
 
 
 def _load_library():
-    # Load featomic & metatensor-torch shared library in the process first, to ensure
-    # the featomic_torch shared library can find them
+    # Load shared library for dependencies in the process first, to ensure the
+    # featomic_torch shared library can find them
     metatensor.torch._c_lib._load_library()
+    metatomic.torch._c_lib._load_library()
 
     featomic._c_lib._get_library()
 

featomic/torch/calculator_base.py

@@ -2,9 +2,7 @@ from typing import List, Optional, Union
 
 import torch
 from metatensor.torch import Labels, TensorMap
-from metatensor.torch.atomistic import NeighborListOptions
-
-from .system import System
+from metatomic.torch import NeighborListOptions, System
 
 
 CalculatorHolder = torch.classes.featomic.CalculatorHolder

featomic/torch/system.py

@@ -2,7 +2,7 @@ from typing import List, Optional, Sequence, overload
 
 import numpy as np
 import torch
-from metatensor.torch.atomistic import System
+from metatomic.torch import System
 
 import featomic
 
@@ -31,9 +31,9 @@ def systems_to_torch(
     cell_requires_grad=None,
 ) -> List[System]:
     """
-    Convert a arbitrary system to metatensor's atomistic
-    :py:class:`metatensor.torch.atomistic.System`, putting all the data in
-    :py:class:`torch.Tensor` and making the overall object compatible with TorchScript.
+    Convert a arbitrary system to :py:class:`metatomic.torch.System`, putting all the
+    data in :py:class:`torch.Tensor` and making the overall object compatible with
+    TorchScript.
 
     :param system: any system supported by featomic. If this is an iterable of system,
         this function converts them all and returns a list of converted systems.

featomic/torch/torch-2.1/include/featomic/torch/autograd.hpp

@@ -41,7 +41,7 @@ public:
         torch::Tensor all_positions,
         torch::Tensor all_cells,
         torch::IValue systems_start,
-        metatensor_torch::TorchTensorBlock block
+        metatensor_torch::TensorBlock block
     );
 
     /// Backward step: get the gradients of some quantity `A` w.r.t. the outputs

featomic/torch/torch-2.1/include/featomic/torch/calculator.hpp

@@ -5,7 +5,7 @@
 
 #include <featomic.hpp>
 #include <metatensor/torch.hpp>
-#include <metatensor/torch/atomistic.hpp>
+#include <metatomic/torch.hpp>
 
 #include "featomic/torch/exports.h"
 
@@ -61,12 +61,12 @@ public:
     void set_selected_keys(torch::IValue selection);
 
     /// which gradients to keep in the output of a calculation
-    std::vector<std::string> gradients = {};
+    std::vector<std::string> gradients;
 
 private:
-    torch::IValue selected_samples_ = torch::IValue();
-    torch::IValue selected_properties_ = torch::IValue();
-    torch::IValue selected_keys_ = torch::IValue();
+    torch::IValue selected_samples_;
+    torch::IValue selected_properties_;
+    torch::IValue selected_keys_;
 };
 
 /// Custom class holder to store, serialize and load featomic calculators
@@ -99,9 +99,9 @@ public:
         return calculator_.cutoffs();
     }
 
-    /// Run a calculation for the given `systems` using the given options
-    metatensor_torch::TorchTensorMap compute(
-        std::vector<metatensor_torch::System> systems,
+    /// Run a calculation for the given `systems` using the given options.
+    metatensor_torch::TensorMap compute(
+        std::vector<metatomic_torch::System> systems,
         TorchCalculatorOptions options = {}
     );
 
@@ -123,9 +123,9 @@ private:
 /// contain `"cell"` gradients.
 ///
 /// `forward_gradients` controls which gradients are left inside the TensorMap.
-metatensor_torch::TorchTensorMap FEATOMIC_TORCH_EXPORT register_autograd(
-    std::vector<metatensor_torch::System> systems,
-    metatensor_torch::TorchTensorMap precomputed,
+metatensor_torch::TensorMap FEATOMIC_TORCH_EXPORT register_autograd(
+    std::vector<metatomic_torch::System> systems,
+    metatensor_torch::TensorMap precomputed,
     std::vector<std::string> forward_gradients
 );
 

featomic/torch/torch-2.1/include/featomic/torch/system.hpp

@@ -7,21 +7,21 @@
 #include <torch/script.h>
 
 #include <featomic.hpp>
-#include <metatensor/torch/atomistic.hpp>
+#include <metatomic/torch.hpp>
 
 #include "featomic/torch/exports.h"
 
 namespace featomic_torch {
 
-/// Implementation of `featomic::System` using `metatensor_torch::System` as
+/// Implementation of `featomic::System` using `metatomic_torch::System` as
 /// backing memory for all the data.
 ///
 /// This can either be used with the Rust neighbor list implementation; or a set
 /// of pre-computed neighbor lists can be added to the system.
 class FEATOMIC_TORCH_EXPORT SystemAdapter final: public featomic::System {
 public:
-    /// Create a `SystemAdapter` wrapping an existing `metatensor_torch::System`
-    SystemAdapter(metatensor_torch::System system);
+    /// Create a `SystemAdapter` wrapping an existing `metatomic_torch::System`
+    SystemAdapter(metatomic_torch::System system);
 
     ~SystemAdapter() override = default;
 
@@ -84,7 +84,7 @@ public:
 
 private:
     // the origin of all the data
-    metatensor_torch::System system_;
+    metatomic_torch::System system_;
 
     /// atomic types tensor, contiguous and on CPU
     torch::Tensor types_;

featomic/torch/torch-2.1/lib/cmake/featomic_torch/featomic_torch-config-version.cmake

@@ -10,13 +10,13 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "0.6.2")
+set(PACKAGE_VERSION "0.7.1")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("0.6.2" MATCHES "^([0-9]+)\\.([0-9]+)")
+  if("0.7.1" MATCHES "^([0-9]+)\\.([0-9]+)")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
 
@@ -27,7 +27,7 @@ else()
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "0.6.2")
+    set(CVF_VERSION_MAJOR "0.7.1")
     set(CVF_VERSION_MINOR "")
   endif()
 

featomic/torch/torch-2.1/lib/cmake/featomic_torch/featomic_torch-config.cmake

@@ -5,9 +5,13 @@ set(REQUIRED_FEATOMIC_VERSION 0.6)
 find_package(featomic ${REQUIRED_FEATOMIC_VERSION} CONFIG REQUIRED)
 
 # use the same version for metatensor_torch as the main CMakeLists.txt
-set(REQUIRED_METATENSOR_TORCH_VERSION 0.7)
+set(REQUIRED_METATENSOR_TORCH_VERSION 0.8.0)
 find_package(metatensor_torch ${REQUIRED_METATENSOR_TORCH_VERSION} CONFIG REQUIRED)
 
+# use the same version for metatomic_torch as the main CMakeLists.txt
+set(REQUIRED_METATOMIC_TORCH_VERSION 0.1)
+find_package(metatomic_torch ${REQUIRED_METATOMIC_TORCH_VERSION} CONFIG REQUIRED)
+
 # We can only load metatensorfeatomic_torch with the same minor version of Torch
 # that was used to compile it (and is stored in BUILD_TORCH_VERSION)
 set(BUILD_TORCH_VERSION 2.1.2)

featomic/torch/torch-2.1/lib/cmake/featomic_torch/featomic_torch-targets.cmake

@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.12")
    message(FATAL_ERROR "CMake >= 2.8.12 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.12...3.30)
+cmake_policy(VERSION 2.8.12...3.31)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------
@@ -61,7 +61,7 @@ add_library(featomic_torch SHARED IMPORTED)
 set_target_properties(featomic_torch PROPERTIES
   INTERFACE_COMPILE_FEATURES "cxx_std_17"
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-  INTERFACE_LINK_LIBRARIES "torch;metatensor_torch;featomic::shared"
+  INTERFACE_LINK_LIBRARIES "torch;metatomic_torch;metatensor_torch;featomic::shared"
 )
 
 # Load information for each installed configuration.

featomic/torch/torch-2.2/include/featomic/torch/autograd.hpp

@@ -41,7 +41,7 @@ public:
         torch::Tensor all_positions,
         torch::Tensor all_cells,
         torch::IValue systems_start,
-        metatensor_torch::TorchTensorBlock block
+        metatensor_torch::TensorBlock block
     );
 
     /// Backward step: get the gradients of some quantity `A` w.r.t. the outputs

featomic/torch/torch-2.2/include/featomic/torch/calculator.hpp

@@ -5,7 +5,7 @@
 
 #include <featomic.hpp>
 #include <metatensor/torch.hpp>
-#include <metatensor/torch/atomistic.hpp>
+#include <metatomic/torch.hpp>
 
 #include "featomic/torch/exports.h"
 
@@ -61,12 +61,12 @@ public:
     void set_selected_keys(torch::IValue selection);
 
     /// which gradients to keep in the output of a calculation
-    std::vector<std::string> gradients = {};
+    std::vector<std::string> gradients;
 
 private:
-    torch::IValue selected_samples_ = torch::IValue();
-    torch::IValue selected_properties_ = torch::IValue();
-    torch::IValue selected_keys_ = torch::IValue();
+    torch::IValue selected_samples_;
+    torch::IValue selected_properties_;
+    torch::IValue selected_keys_;
 };
 
 /// Custom class holder to store, serialize and load featomic calculators
@@ -99,9 +99,9 @@ public:
         return calculator_.cutoffs();
     }
 
-    /// Run a calculation for the given `systems` using the given options
-    metatensor_torch::TorchTensorMap compute(
-        std::vector<metatensor_torch::System> systems,
+    /// Run a calculation for the given `systems` using the given options.
+    metatensor_torch::TensorMap compute(
+        std::vector<metatomic_torch::System> systems,
         TorchCalculatorOptions options = {}
     );
 
@@ -123,9 +123,9 @@ private:
 /// contain `"cell"` gradients.
 ///
 /// `forward_gradients` controls which gradients are left inside the TensorMap.
-metatensor_torch::TorchTensorMap FEATOMIC_TORCH_EXPORT register_autograd(
-    std::vector<metatensor_torch::System> systems,
-    metatensor_torch::TorchTensorMap precomputed,
+metatensor_torch::TensorMap FEATOMIC_TORCH_EXPORT register_autograd(
+    std::vector<metatomic_torch::System> systems,
+    metatensor_torch::TensorMap precomputed,
     std::vector<std::string> forward_gradients
 );
 

featomic/torch/torch-2.2/include/featomic/torch/system.hpp

@@ -7,21 +7,21 @@
 #include <torch/script.h>
 
 #include <featomic.hpp>
-#include <metatensor/torch/atomistic.hpp>
+#include <metatomic/torch.hpp>
 
 #include "featomic/torch/exports.h"
 
 namespace featomic_torch {
 
-/// Implementation of `featomic::System` using `metatensor_torch::System` as
+/// Implementation of `featomic::System` using `metatomic_torch::System` as
 /// backing memory for all the data.
 ///
 /// This can either be used with the Rust neighbor list implementation; or a set
 /// of pre-computed neighbor lists can be added to the system.
 class FEATOMIC_TORCH_EXPORT SystemAdapter final: public featomic::System {
 public:
-    /// Create a `SystemAdapter` wrapping an existing `metatensor_torch::System`
-    SystemAdapter(metatensor_torch::System system);
+    /// Create a `SystemAdapter` wrapping an existing `metatomic_torch::System`
+    SystemAdapter(metatomic_torch::System system);
 
     ~SystemAdapter() override = default;
 
@@ -84,7 +84,7 @@ public:
 
 private:
     // the origin of all the data
-    metatensor_torch::System system_;
+    metatomic_torch::System system_;
 
     /// atomic types tensor, contiguous and on CPU
     torch::Tensor types_;

featomic/torch/torch-2.2/lib/cmake/featomic_torch/featomic_torch-config-version.cmake

@@ -10,13 +10,13 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "0.6.2")
+set(PACKAGE_VERSION "0.7.1")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("0.6.2" MATCHES "^([0-9]+)\\.([0-9]+)")
+  if("0.7.1" MATCHES "^([0-9]+)\\.([0-9]+)")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
 
@@ -27,7 +27,7 @@ else()
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "0.6.2")
+    set(CVF_VERSION_MAJOR "0.7.1")
     set(CVF_VERSION_MINOR "")
   endif()
 

featomic/torch/torch-2.2/lib/cmake/featomic_torch/featomic_torch-config.cmake

@@ -5,9 +5,13 @@ set(REQUIRED_FEATOMIC_VERSION 0.6)
 find_package(featomic ${REQUIRED_FEATOMIC_VERSION} CONFIG REQUIRED)
 
 # use the same version for metatensor_torch as the main CMakeLists.txt
-set(REQUIRED_METATENSOR_TORCH_VERSION 0.7)
+set(REQUIRED_METATENSOR_TORCH_VERSION 0.8.0)
 find_package(metatensor_torch ${REQUIRED_METATENSOR_TORCH_VERSION} CONFIG REQUIRED)
 
+# use the same version for metatomic_torch as the main CMakeLists.txt
+set(REQUIRED_METATOMIC_TORCH_VERSION 0.1)
+find_package(metatomic_torch ${REQUIRED_METATOMIC_TORCH_VERSION} CONFIG REQUIRED)
+
 # We can only load metatensorfeatomic_torch with the same minor version of Torch
 # that was used to compile it (and is stored in BUILD_TORCH_VERSION)
 set(BUILD_TORCH_VERSION 2.2.2)

featomic/torch/torch-2.2/lib/cmake/featomic_torch/featomic_torch-targets.cmake

@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.12")
    message(FATAL_ERROR "CMake >= 2.8.12 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.12...3.30)
+cmake_policy(VERSION 2.8.12...3.31)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------
@@ -61,7 +61,7 @@ add_library(featomic_torch SHARED IMPORTED)
 set_target_properties(featomic_torch PROPERTIES
   INTERFACE_COMPILE_FEATURES "cxx_std_17"
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-  INTERFACE_LINK_LIBRARIES "torch;metatensor_torch;featomic::shared"
+  INTERFACE_LINK_LIBRARIES "torch;metatomic_torch;metatensor_torch;featomic::shared"
 )
 
 # Load information for each installed configuration.

featomic/torch/torch-2.3/include/featomic/torch/autograd.hpp

@@ -41,7 +41,7 @@ public:
         torch::Tensor all_positions,
         torch::Tensor all_cells,
         torch::IValue systems_start,
-        metatensor_torch::TorchTensorBlock block
+        metatensor_torch::TensorBlock block
     );
 
     /// Backward step: get the gradients of some quantity `A` w.r.t. the outputs

featomic/torch/torch-2.3/include/featomic/torch/calculator.hpp

@@ -5,7 +5,7 @@
 
 #include <featomic.hpp>
 #include <metatensor/torch.hpp>
-#include <metatensor/torch/atomistic.hpp>
+#include <metatomic/torch.hpp>
 
 #include "featomic/torch/exports.h"
 
@@ -61,12 +61,12 @@ public:
     void set_selected_keys(torch::IValue selection);
 
     /// which gradients to keep in the output of a calculation
-    std::vector<std::string> gradients = {};
+    std::vector<std::string> gradients;
 
 private:
-    torch::IValue selected_samples_ = torch::IValue();
-    torch::IValue selected_properties_ = torch::IValue();
-    torch::IValue selected_keys_ = torch::IValue();
+    torch::IValue selected_samples_;
+    torch::IValue selected_properties_;
+    torch::IValue selected_keys_;
 };
 
 /// Custom class holder to store, serialize and load featomic calculators
@@ -99,9 +99,9 @@ public:
         return calculator_.cutoffs();
     }
 
-    /// Run a calculation for the given `systems` using the given options
-    metatensor_torch::TorchTensorMap compute(
-        std::vector<metatensor_torch::System> systems,
+    /// Run a calculation for the given `systems` using the given options.
+    metatensor_torch::TensorMap compute(
+        std::vector<metatomic_torch::System> systems,
         TorchCalculatorOptions options = {}
     );
 
@@ -123,9 +123,9 @@ private:
 /// contain `"cell"` gradients.
 ///
 /// `forward_gradients` controls which gradients are left inside the TensorMap.
-metatensor_torch::TorchTensorMap FEATOMIC_TORCH_EXPORT register_autograd(
-    std::vector<metatensor_torch::System> systems,
-    metatensor_torch::TorchTensorMap precomputed,
+metatensor_torch::TensorMap FEATOMIC_TORCH_EXPORT register_autograd(
+    std::vector<metatomic_torch::System> systems,
+    metatensor_torch::TensorMap precomputed,
     std::vector<std::string> forward_gradients
 );
 

featomic/torch/torch-2.3/include/featomic/torch/system.hpp

@@ -7,21 +7,21 @@
 #include <torch/script.h>
 
 #include <featomic.hpp>
-#include <metatensor/torch/atomistic.hpp>
+#include <metatomic/torch.hpp>
 
 #include "featomic/torch/exports.h"
 
 namespace featomic_torch {
 
-/// Implementation of `featomic::System` using `metatensor_torch::System` as
+/// Implementation of `featomic::System` using `metatomic_torch::System` as
 /// backing memory for all the data.
 ///
 /// This can either be used with the Rust neighbor list implementation; or a set
 /// of pre-computed neighbor lists can be added to the system.
 class FEATOMIC_TORCH_EXPORT SystemAdapter final: public featomic::System {
 public:
-    /// Create a `SystemAdapter` wrapping an existing `metatensor_torch::System`
-    SystemAdapter(metatensor_torch::System system);
+    /// Create a `SystemAdapter` wrapping an existing `metatomic_torch::System`
+    SystemAdapter(metatomic_torch::System system);
 
     ~SystemAdapter() override = default;
 
@@ -84,7 +84,7 @@ public:
 
 private:
     // the origin of all the data
-    metatensor_torch::System system_;
+    metatomic_torch::System system_;
 
     /// atomic types tensor, contiguous and on CPU
     torch::Tensor types_;

featomic/torch/torch-2.3/lib/cmake/featomic_torch/featomic_torch-config-version.cmake

@@ -10,13 +10,13 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "0.6.2")
+set(PACKAGE_VERSION "0.7.1")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("0.6.2" MATCHES "^([0-9]+)\\.([0-9]+)")
+  if("0.7.1" MATCHES "^([0-9]+)\\.([0-9]+)")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
 
@@ -27,7 +27,7 @@ else()
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "0.6.2")
+    set(CVF_VERSION_MAJOR "0.7.1")
     set(CVF_VERSION_MINOR "")
   endif()
 

featomic/torch/torch-2.3/lib/cmake/featomic_torch/featomic_torch-config.cmake

@@ -5,9 +5,13 @@ set(REQUIRED_FEATOMIC_VERSION 0.6)
 find_package(featomic ${REQUIRED_FEATOMIC_VERSION} CONFIG REQUIRED)
 
 # use the same version for metatensor_torch as the main CMakeLists.txt
-set(REQUIRED_METATENSOR_TORCH_VERSION 0.7)
+set(REQUIRED_METATENSOR_TORCH_VERSION 0.8.0)
 find_package(metatensor_torch ${REQUIRED_METATENSOR_TORCH_VERSION} CONFIG REQUIRED)
 
+# use the same version for metatomic_torch as the main CMakeLists.txt
+set(REQUIRED_METATOMIC_TORCH_VERSION 0.1)
+find_package(metatomic_torch ${REQUIRED_METATOMIC_TORCH_VERSION} CONFIG REQUIRED)
+
 # We can only load metatensorfeatomic_torch with the same minor version of Torch
 # that was used to compile it (and is stored in BUILD_TORCH_VERSION)
 set(BUILD_TORCH_VERSION 2.3.1)

featomic/torch/torch-2.3/lib/cmake/featomic_torch/featomic_torch-targets.cmake

@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.12")
    message(FATAL_ERROR "CMake >= 2.8.12 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.12...3.30)
+cmake_policy(VERSION 2.8.12...3.31)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------
@@ -61,7 +61,7 @@ add_library(featomic_torch SHARED IMPORTED)
 set_target_properties(featomic_torch PROPERTIES
   INTERFACE_COMPILE_FEATURES "cxx_std_17"
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-  INTERFACE_LINK_LIBRARIES "torch;metatensor_torch;featomic::shared"
+  INTERFACE_LINK_LIBRARIES "torch;metatomic_torch;metatensor_torch;featomic::shared"
 )
 
 # Load information for each installed configuration.

featomic/torch/torch-2.4/include/featomic/torch/autograd.hpp

@@ -41,7 +41,7 @@ public:
         torch::Tensor all_positions,
         torch::Tensor all_cells,
         torch::IValue systems_start,
-        metatensor_torch::TorchTensorBlock block
+        metatensor_torch::TensorBlock block
     );
 
     /// Backward step: get the gradients of some quantity `A` w.r.t. the outputs

featomic/torch/torch-2.4/include/featomic/torch/calculator.hpp

@@ -5,7 +5,7 @@
 
 #include <featomic.hpp>
 #include <metatensor/torch.hpp>
-#include <metatensor/torch/atomistic.hpp>
+#include <metatomic/torch.hpp>
 
 #include "featomic/torch/exports.h"
 
@@ -61,12 +61,12 @@ public:
     void set_selected_keys(torch::IValue selection);
 
     /// which gradients to keep in the output of a calculation
-    std::vector<std::string> gradients = {};
+    std::vector<std::string> gradients;
 
 private:
-    torch::IValue selected_samples_ = torch::IValue();
-    torch::IValue selected_properties_ = torch::IValue();
-    torch::IValue selected_keys_ = torch::IValue();
+    torch::IValue selected_samples_;
+    torch::IValue selected_properties_;
+    torch::IValue selected_keys_;
 };
 
 /// Custom class holder to store, serialize and load featomic calculators
@@ -99,9 +99,9 @@ public:
         return calculator_.cutoffs();
     }
 
-    /// Run a calculation for the given `systems` using the given options
-    metatensor_torch::TorchTensorMap compute(
-        std::vector<metatensor_torch::System> systems,
+    /// Run a calculation for the given `systems` using the given options.
+    metatensor_torch::TensorMap compute(
+        std::vector<metatomic_torch::System> systems,
         TorchCalculatorOptions options = {}
     );
 
@@ -123,9 +123,9 @@ private:
 /// contain `"cell"` gradients.
 ///
 /// `forward_gradients` controls which gradients are left inside the TensorMap.
-metatensor_torch::TorchTensorMap FEATOMIC_TORCH_EXPORT register_autograd(
-    std::vector<metatensor_torch::System> systems,
-    metatensor_torch::TorchTensorMap precomputed,
+metatensor_torch::TensorMap FEATOMIC_TORCH_EXPORT register_autograd(
+    std::vector<metatomic_torch::System> systems,
+    metatensor_torch::TensorMap precomputed,
     std::vector<std::string> forward_gradients
 );
 

featomic/torch/torch-2.4/include/featomic/torch/system.hpp

@@ -7,21 +7,21 @@
 #include <torch/script.h>
 
 #include <featomic.hpp>
-#include <metatensor/torch/atomistic.hpp>
+#include <metatomic/torch.hpp>
 
 #include "featomic/torch/exports.h"
 
 namespace featomic_torch {
 
-/// Implementation of `featomic::System` using `metatensor_torch::System` as
+/// Implementation of `featomic::System` using `metatomic_torch::System` as
 /// backing memory for all the data.
 ///
 /// This can either be used with the Rust neighbor list implementation; or a set
 /// of pre-computed neighbor lists can be added to the system.
 class FEATOMIC_TORCH_EXPORT SystemAdapter final: public featomic::System {
 public:
-    /// Create a `SystemAdapter` wrapping an existing `metatensor_torch::System`
-    SystemAdapter(metatensor_torch::System system);
+    /// Create a `SystemAdapter` wrapping an existing `metatomic_torch::System`
+    SystemAdapter(metatomic_torch::System system);
 
     ~SystemAdapter() override = default;
 
@@ -84,7 +84,7 @@ public:
 
 private:
     // the origin of all the data
-    metatensor_torch::System system_;
+    metatomic_torch::System system_;
 
     /// atomic types tensor, contiguous and on CPU
     torch::Tensor types_;