Merge pull request #19 from 3MAH/fix_conda_1.9.5

Fix conda 1.9.5
3MAH · Oct 16, 2024 · 79a4837 · 79a4837
2 parents 6114f8c + b27c7b9
commit 79a4837
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,11 +111,11 @@ else()
   enable_language(Fortran)
 
   if (DEBUG)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -stdlib=libc++ -O0 -Drestrict=")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -stdlib=libc++ -O0 -fpermissive -Drestrict=")
       set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -std=c++17 -stdlib=libc++")
       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -std=c++17 -stdlib=libc++")
   else()
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -stdlib=libc++ -O3 -Drestrict=")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -stdlib=libc++ -O3 -fpermissive -Drestrict=")
       set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -std=c++17 -stdlib=libc++")
       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -std=c++17 -stdlib=libc++")
   endif()

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -33,7 +33,7 @@ requirements:
     - liblapack * *openblas # [not win]
     - libblas * *netlib # [win]
     - liblapack * *netlib # [win]
-    - armadillo
+    - armadillo >=12.6
     - carma    
     - llvm-openmp
     - ninja

diff --git a/include/simcoon/FTensor.hpp b/include/simcoon/FTensor.hpp
@@ -2,6 +2,7 @@
    in namespace FTensor. */
 
 #pragma once
+
 #include <cmath>
 #include <complex>
 #include <type_traits>

diff --git a/include/simcoon/FTensor/Christof/Christof_pointer.hpp b/include/simcoon/FTensor/Christof/Christof_pointer.hpp
@@ -9,8 +9,7 @@ namespace FTensor
   template <class T, int Tensor_Dim0, int Tensor_Dim12>
   class Christof<T *, Tensor_Dim0, Tensor_Dim12>
   {
-    mutable T *restrict
-      data[Tensor_Dim0][(Tensor_Dim12 * (Tensor_Dim12 + 1)) / 2];
+    mutable T *data[Tensor_Dim0][(Tensor_Dim12 * (Tensor_Dim12 + 1)) / 2];
 
   public:
     template <class... U> Christof(U *... d) : data{d...}

diff --git a/include/simcoon/FTensor/Ddg/Ddg_pointer.hpp b/include/simcoon/FTensor/Ddg/Ddg_pointer.hpp
@@ -7,8 +7,8 @@ namespace FTensor
   template <class T, int Tensor_Dim01, int Tensor_Dim23>
   class Ddg<T *, Tensor_Dim01, Tensor_Dim23>
   {
-    mutable T *restrict data[(Tensor_Dim01 * (Tensor_Dim01 + 1)) / 2]
-                            [(Tensor_Dim23 * (Tensor_Dim23 + 1)) / 2];
+    mutable T *data[(Tensor_Dim01 * (Tensor_Dim01 + 1)) / 2]
+                   [(Tensor_Dim23 * (Tensor_Dim23 + 1)) / 2];
 
   public:
     /* There are two operator(int,int,int,int)'s, one for non-consts

diff --git a/include/simcoon/FTensor/Dg/Dg_pointer.hpp b/include/simcoon/FTensor/Dg/Dg_pointer.hpp
@@ -7,8 +7,7 @@ namespace FTensor
   template <class T, int Tensor_Dim01, int Tensor_Dim2>
   class Dg<T *, Tensor_Dim01, Tensor_Dim2>
   {
-    mutable T *restrict
-      data[(Tensor_Dim01 * (Tensor_Dim01 + 1)) / 2][Tensor_Dim2];
+    mutable T *data[(Tensor_Dim01 * (Tensor_Dim01 + 1)) / 2][Tensor_Dim2];
 
   public:
     template <class... U> Dg(U *... d) : data{d...}

diff --git a/include/simcoon/FTensor/Tensor0.hpp b/include/simcoon/FTensor/Tensor0.hpp
@@ -18,7 +18,7 @@ namespace FTensor
 
   template <class T> class Tensor0<T *>
   {
-    mutable T *restrict data;
+    mutable T *data;
 
   public:
     Tensor0(T *d) : data(d) {}

diff --git a/include/simcoon/FTensor/Tensor1/Tensor1_pointer.hpp b/include/simcoon/FTensor/Tensor1/Tensor1_pointer.hpp
@@ -10,7 +10,7 @@ namespace FTensor
     /* Note that the T *'s are mutable, so the pointer can change,
        allowing iterating over a array. */
 
-    mutable T *restrict data[Tensor_Dim];
+    mutable T *data[Tensor_Dim];
 
   public:
     /* Initializations for varying numbers of elements. */

diff --git a/include/simcoon/FTensor/Tensor2/Tensor2_pointer.hpp b/include/simcoon/FTensor/Tensor2/Tensor2_pointer.hpp
@@ -7,7 +7,7 @@ namespace FTensor
   template <class T, int Tensor_Dim0, int Tensor_Dim1>
   class Tensor2<T *, Tensor_Dim0, Tensor_Dim1>
   {
-    mutable T *restrict data[Tensor_Dim0][Tensor_Dim1];
+    mutable T *data[Tensor_Dim0][Tensor_Dim1];
 
   public:
     /* Initializations for varying numbers of elements. */

diff --git a/include/simcoon/FTensor/Tensor2_symmetric/Tensor2_symmetric_pointer.hpp b/include/simcoon/FTensor/Tensor2_symmetric/Tensor2_symmetric_pointer.hpp
@@ -6,7 +6,7 @@ namespace FTensor
 {
   template <class T, int Tensor_Dim> class Tensor2_symmetric<T *, Tensor_Dim>
   {
-    mutable T *restrict data[(Tensor_Dim * (Tensor_Dim + 1)) / 2];
+    mutable T *data[(Tensor_Dim * (Tensor_Dim + 1)) / 2];
 
   public:
     template <class... U> Tensor2_symmetric(U *... d) : data{d...}

diff --git a/include/simcoon/FTensor/Tensor3_antisymmetric/Tensor3_antisymmetric_pointer.hpp b/include/simcoon/FTensor/Tensor3_antisymmetric/Tensor3_antisymmetric_pointer.hpp
@@ -7,8 +7,7 @@ namespace FTensor
   template <class T, int Tensor_Dim0, int Tensor_Dim12>
   class Tensor3_antisymmetric<T *, Tensor_Dim0, Tensor_Dim12>
   {
-    mutable T *restrict
-      data[Tensor_Dim0][(Tensor_Dim12 * (Tensor_Dim12 - 1)) / 2];
+    mutable T *data[Tensor_Dim0][(Tensor_Dim12 * (Tensor_Dim12 - 1)) / 2];
 
   public:
     template <class... U> Tensor3_antisymmetric(U *... d) : data{d...}