Merge pull request #195 from jakobrunge/developer

Developer
jakobrunge · Mar 23, 2022 · 4ef2eb0 · 4ef2eb0
2 parents 8e6a639 + 7a218ec
commit 4ef2eb0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ Tigramite is a causal time series analysis python package. It allows to efficien
 - scikit-learn>=0.21  # Gaussian Process (GP) Regression
 - matplotlib>=3.4.0   # Plotting
 - networkx>=2.4       # Plotting
-- pytorch>=1.11.0     # GPDC pytorch version
+- torch>=1.11.0       # GPDC pytorch version (in conda install pytorch)
 - gpytorch>=1.4       # GPDC gpytorch version
 - dcor>=0.5.3         # GPDC distance correlation version
 

diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@ def run(self):
         "scikit-learn>=0.21",  # Gaussian Process (GP) Regression
         "matplotlib>=3.4.0",   # plotting
         "networkx>=2.4",       # plotting
-        "pytorch>=1.11.0",     # GPDC pytorch version
+        "torch>=1.11.0",       # GPDC torch version
         "gpytorch>=1.4",       # GPDC gpytorch version
         "dcor>=0.5.3",         # GPDC distance correlation version
     ]
@@ -52,7 +52,7 @@ def run(self):
 
 # Define the packages needed for testing
 TESTS_REQUIRE = ["nose", "pytest", "networkx>=2.4", "scikit-learn>=0.21", 
-                 "pytorch>=1.11.0", "gpytorch>=1.4", "dcor>=0.5.3"]
+                 "torch>=1.11.0", "gpytorch>=1.4", "dcor>=0.5.3"]
 EXTRAS_REQUIRE["test"] = TESTS_REQUIRE
 # Define the extras needed for development
 EXTRAS_REQUIRE["dev"] = EXTRAS_REQUIRE["all"]
@@ -63,7 +63,7 @@ def run(self):
 # Run the setup
 setup(
     name="tigramite",
-    version="5.0.1.2",
+    version="5.0.1.3",
     packages=["tigramite", "tigramite.independence_tests", "tigramite.toymodels"],
     license="GNU General Public License v3.0",
     description="Tigramite causal discovery for time series",

diff --git a/tigramite/independence_tests/gpdc_torch.py b/tigramite/independence_tests/gpdc_torch.py
@@ -23,9 +23,9 @@
         if metadata.version('dcor') < packages['dcor']:
             raise Exception('Version mismatch. Installed version of dcor', metadata.version('dcor'),
                             'Please install dcor>=', packages['dcor'])
-        if metadata.version('torch') < packages['pytorch']:
-            raise Exception('Version mismatch. Installed version of pytorch', metadata.version('torch'),
-                            'Please install pytorch>=', packages['pytorch'])
+        if metadata.version('torch') < packages['torch']:
+            raise Exception('Version mismatch. Installed version of torch', metadata.version('torch'),
+                            'Please install torch>=', packages['torch'])
         if metadata.version('gpytorch') < packages['gpytorch']:
             raise Exception('Version mismatch. Installed version of gpytorch', metadata.version('gpytorch'),
                           'Please install gpytorch>=', packages['gpytorch'])