fix non-pch compilation and do the linters bidding

ewanwm · Sep 18, 2024 · 3e7f8a1 · 3e7f8a1
1 parent 062a9a6
commit 3e7f8a1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/nuTens/CMakeLists.txt b/nuTens/CMakeLists.txt
@@ -5,6 +5,7 @@
 add_library(logging logging.hpp)
 target_link_libraries(logging spdlog::spdlog)
 set_target_properties(logging PROPERTIES LINKER_LANGUAGE CXX)
+target_include_directories(logging PUBLIC "${SPDLOG_INCLUDE_DIRS}")
 
 set( NT_LOG_LEVEL "INFO" CACHE STRING "the level of detail to log to the console" )
 

diff --git a/nuTens/tensors/CMakeLists.txt b/nuTens/tensors/CMakeLists.txt
@@ -9,6 +9,8 @@ IF(NT_USE_PCH)
     target_link_libraries(tensor PUBLIC nuTens-pch)
 
 ELSE()
+    target_link_libraries(tensor PUBLIC logging)
+
     IF(TORCH_FOUND)
 
         target_link_libraries(tensor PUBLIC "${TORCH_LIBRARIES}")

diff --git a/nuTens/tensors/dtypes.hpp b/nuTens/tensors/dtypes.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#if USE_PYTORCH
+#include <torch/torch.h>
+#endif
+
 /*!
  * @file dtypes.hpp
  * @brief Defines various datatypes used in the project

diff --git a/nuTens/tensors/tensor.hpp b/nuTens/tensors/tensor.hpp
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <map>
 #include <nuTens/instrumentation.hpp>
+#include <nuTens/logging.hpp>
 #include <nuTens/tensors/dtypes.hpp>
 #include <variant>
 #include <vector>
@@ -378,14 +379,14 @@ class Tensor
     {
         NT_PROFILE();
 
-        _tensor = tensor;
+        _tensor = std::move(tensor);
         _dType = NTdtypes::invScalarTypeMap.at(tensor.scalar_type());
         _device = NTdtypes::invDeviceTypeMap.at(tensor.device().type());
     }
 
     /// Utility function to convert from a vector of ints to a vector of a10 tensor indices, which is needed for
     /// accessing values of a tensor.
-    inline std::vector<at::indexing::TensorIndex> convertIndices(const std::vector<int> &indices) const
+    [[nodiscard]] inline std::vector<at::indexing::TensorIndex> convertIndices(const std::vector<int> &indices) const
     {
         NT_PROFILE();
 
@@ -401,7 +402,8 @@ class Tensor
 
     /// Utility function to convert from a vector of ints to a vector of a10 tensor indices, which is needed for
     /// accessing values of a tensor.
-    inline std::vector<at::indexing::TensorIndex> convertIndices(const std::vector<Tensor::indexType> &indices) const
+    [[nodiscard]] inline std::vector<at::indexing::TensorIndex> convertIndices(
+        const std::vector<Tensor::indexType> &indices) const
     {
         NT_PROFILE();
 

diff --git a/python/pyNuTens.cpp b/python/pyNuTens.cpp
@@ -14,9 +14,9 @@
 
 namespace py = pybind11;
 
-void initTensor(py::module &);
-void initPropagator(py::module &);
-void initDtypes(py::module &);
+void initTensor(py::module & /*m*/);
+void initPropagator(py::module & /*m*/);
+void initDtypes(py::module & /*m*/);
 
 // initialise the top level module "pyNuTens"
 PYBIND11_MODULE(pyNuTens, m)