Debug general_config path in main.py and diffusion.py

AdrienC21 · Sep 18, 2023 · 61adca1 · 61adca1
1 parent 31d835c
commit 61adca1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 ==================================
 
+0.3.3 (2023/09/18)
+--------------------
+
+- Debug like 0.3.1 (add path to general_config in diffusion.py and main.py)
+
 0.3.2 (2023/09/18)
 --------------------
 

diff --git a/ccsd/__init__.py b/ccsd/__init__.py
@@ -5,6 +5,6 @@
 
 __author__ = "Adrien Carrel"
 __email__ = "a.carrel@hotmail.fr"
-__version__ = "0.3.2"
+__version__ = "0.3.3"
 
 __all__ = ["src", "data"]
diff --git a/ccsd/diffusion.py b/ccsd/diffusion.py
@@ -105,7 +105,7 @@ def run(self) -> None:
         """
         # Get the configuration and the general configuration
         config = get_config(self.args.config, self.args.seed, self.args.folder)
-        general_config = get_general_config()
+        general_config = get_general_config(self.args.folder)
 
         # Print the initial message
         if general_config.print_initial:

diff --git a/main.py b/main.py
@@ -42,7 +42,7 @@ def main(args: argparse.Namespace) -> None:
 
     # Get the configuration and the general configuration
     config = get_config(args.config, args.seed, args.folder)
-    general_config = get_general_config()
+    general_config = get_general_config(args.folder)
 
     # Print the initial message
     if general_config.print_initial:

diff --git a/scripts/CCSD_Example.ipynb b/scripts/CCSD_Example.ipynb
@@ -716,8 +716,8 @@
      "output_type": "stream",
      "text": [
       "Collecting ccsd\n",
-      "  Obtaining dependency information for ccsd from https://files.pythonhosted.org/packages/c5/e7/d4ca5d7c96399cd8149de66fd8bdd30c7f5c8c41087ffdd94271c59fff4f/ccsd-0.3.1-py3-none-any.whl.metadata\n",
-      "  Downloading ccsd-0.3.1-py3-none-any.whl.metadata (26 kB)\n",
+      "  Obtaining dependency information for ccsd from https://files.pythonhosted.org/packages/aa/17/ef06fafdf3e399351b05fc9aba9a9bfe88305af4d5c050bdb4049571d4fd/ccsd-0.3.2-py3-none-any.whl.metadata\n",
+      "  Downloading ccsd-0.3.2-py3-none-any.whl.metadata (26 kB)\n",
       "Requirement already satisfied: dill>=0.3.6 in c:\\users\\acarr\\miniconda3\\lib\\site-packages (from ccsd) (0.3.6)\n",
       "Requirement already satisfied: easydict>=1.10 in c:\\users\\acarr\\miniconda3\\lib\\site-packages (from ccsd) (1.10)\n",
       "Requirement already satisfied: freezegun>=1.2.2 in c:\\users\\acarr\\miniconda3\\lib\\site-packages (from ccsd) (1.2.2)\n",
@@ -795,11 +795,11 @@
       "Requirement already satisfied: MarkupSafe>=2.0 in c:\\users\\acarr\\miniconda3\\lib\\site-packages (from jinja2->torch>=2.0.1->ccsd) (2.1.1)\n",
       "Requirement already satisfied: mpmath>=0.19 in c:\\users\\acarr\\miniconda3\\lib\\site-packages (from sympy->torch>=2.0.1->ccsd) (1.3.0)\n",
       "Requirement already satisfied: smmap<6,>=3.0.1 in c:\\users\\acarr\\miniconda3\\lib\\site-packages (from gitdb<5,>=4.0.1->GitPython!=3.1.29,>=1.0.0->wandb->ccsd) (5.0.0)\n",
-      "Downloading ccsd-0.3.1-py3-none-any.whl (137 kB)\n",
+      "Downloading ccsd-0.3.2-py3-none-any.whl (138 kB)\n",
       "   ---------------------------------------- 0.0/138.0 kB ? eta -:--:--\n",
       "   ---------------------------------------- 138.0/138.0 kB 4.1 MB/s eta 0:00:00\n",
       "Installing collected packages: ccsd\n",
-      "Successfully installed ccsd-0.3.1\n"
+      "Successfully installed ccsd-0.3.2\n"
      ]
     }
    ],