issue #31 change to setup.py

ion-g-ion · Dec 11, 2024 · 1b27da6 · 1b27da6
1 parent c43b664
commit 1b27da6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -5,8 +5,7 @@ on:
   push:
     branches:
       - main
-    # Alternative: only build for tags.
-    tags:
+    tags-ignore:
       - '*'
 
 # security: restrict permissions for CI jobs.

diff --git a/cpp/define.h b/cpp/define.h
@@ -5,7 +5,7 @@
 #include <array>
 #include <iostream>
 #include <chrono>
-#include "BLAS.h"
+// #include "BLAS.h"
 
 // torch::NoGradGuard no_grad;
 

diff --git a/cpp/gmres.h b/cpp/gmres.h
@@ -160,7 +160,7 @@ void gmres(at::Tensor &solution, int &flag, int &nit, AMENsolveMV<T> &Op, at::Te
     }
 }
 
-
+/*
 void gmres_double_cpu(double *solution, 
                       int &flag, 
                       int &nit, 
@@ -307,4 +307,4 @@ void gmres_double_cpu(double *solution,
     delete [] work1;
     delete [] H;
     delete [] piv_tmp;
-}
+}*/
diff --git a/cpp/matvecs.h b/cpp/matvecs.h
@@ -1,7 +1,7 @@
 #include "define.h"
 
 
-
+/*
 template <typename T> 
 class AMENsolveMV_cpu{
 
@@ -126,7 +126,7 @@ class AMENsolveMV_cpu{
     }
 
 }; 
-
+*/
 template <typename T> class AMENsolveMV{
 
 private:

diff --git a/pyproject.toml b/pyproject.toml
@@ -2,11 +2,11 @@
 requires = ["setuptools>=61", "setuptools-scm>=8.0", "wheel", "torch>=1.7", "numpy>=1.18", "opt_einsum", "ninja", "scipy>=0.16"]
 build-backend = "setuptools.build_meta"
 
-[tool.setuptools.package-data]
-torchtt = ["cpp/*"]
+[tool.setuptools]
+packages = ["torchtt"]
 
-[tool.setuptools.packages]
-find = {}  # Scan the project directory with the default parameters
+#[tool.setuptools.package-data]
+#torchtt = ["cpp/*"]
 
 [project]
 name = "torchTT"

diff --git a/setup.py b/setup.py
@@ -47,8 +47,9 @@
                     'torchttcpp',
                     ['cpp/cpp_ext.cpp'],
                     include_dirs=["cpp"],
-                    libraries=["blas", "lapack", "stdc++"],
+                    #libraries=["blas", "lapack", "stdc++"],
                     extra_compile_args=[
+                        #'-lblas', '-llapack',
                         '-std=c++17',
                         '-Wno-c++11-narrowing', '-w', '-O3',
                     ],
@@ -59,7 +60,7 @@
     except Exception as e:
         warn("\x1B[33m\nC++ implementation not available. Falling back to pure Python.\n\033[0m")
         print(f"Error: {e}")
-        #setup()
+        setup()
 else:
     warn("\x1B[33m\nC++ implementation not supported on this OS. Falling back to pure Python.\n\033[0m")
-    #setup()
+    setup()