Merge pull request #10 from adc-connect/activate-libxm

Activate libxm in CI and Releases
adc-connect · Dec 20, 2020 · 1f5135f · 1f5135f
2 parents 97b5e9a + f66f9bf
commit 1f5135f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -34,7 +34,7 @@ jobs:
       shell: bash
       run: |
         ccache --max-size 2G
-        ./build_libtensor.py -v -d ${{runner.workspace}}/build --install ${{runner.workspace}}/install --type Release
+        ./build_libtensor.py -v -d ${{runner.workspace}}/build --install ${{runner.workspace}}/install --type Release --features libxm
 
     - name: Test
       working-directory: ${{runner.workspace}}/build

diff --git a/conda/build.sh b/conda/build.sh
@@ -1 +1 @@
-./build_libtensor.py -v -d build --install ${PREFIX} --type Release --features mkl
+./build_libtensor.py -v -d build --install ${PREFIX} --type Release --features mkl libxm
diff --git a/libtensor/core/allocator.h b/libtensor/core/allocator.h
@@ -68,6 +68,11 @@ class allocator {
      **/
     static void init() { init("standard", NULL); }
 
+    /** Old init function for compatibility. Deprecated */
+    static void init(const std::string &implementation, size_t, size_t, size_t,
+                     size_t, const char *pfprefix = 0) {
+        init(implementation, pfprefix);
+    }
 
     /** \brief Shuts down the allocator
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		./build_libtensor.py -v -d build --install ${PREFIX} --type Release --features mkl
		./build_libtensor.py -v -d build --install ${PREFIX} --type Release --features mkl libxm