use fracridge pypi package; fix ViCCo-Group#20

hahahannes · Apr 11, 2022 · 58eefdc · 58eefdc
1 parent c6d645c
commit 58eefdc
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 393 deletions.
diff --git a/frrsa/fitting/fitting.py b/frrsa/fitting/fitting.py
@@ -13,11 +13,7 @@
 import numpy as np
 from sklearn.preprocessing import StandardScaler
 from sklearn.linear_model import Ridge
-
-if ('dev' not in str(Path(os.getcwd()).parent)) and ('draco' not in str(Path(os.getcwd()).parent)) and ('cobra' not in str(Path(os.getcwd()).parent)):
-    from fitting.fracridge import fracridge
-else:
-    from frrsa.frrsa.fitting.fracridge import fracridge
+from fracridge import fracridge
 
 
 def count_targets(y):

diff --git a/frrsa/fitting/fracridge/__init__.py b/frrsa/fitting/fracridge/__init__.py
diff --git a/frrsa/fitting/fracridge/_linalg.py b/frrsa/fitting/fracridge/_linalg.py
diff --git a/frrsa/fitting/fracridge/_numba.py b/frrsa/fitting/fracridge/_numba.py