refactor all folders to start for a complete new version

OuyangWenyu · Mar 21, 2024 · 235bb26 · 235bb26
1 parent 9d51465
commit 235bb26
Show file tree

Hide file tree

Showing 51 changed files with 202 additions and 39,734 deletions.
diff --git a/--algorithm b/--algorithm
diff --git a/environment-dev.yml → env-dev.yml b/environment-dev.yml → env-dev.yml
@@ -1,32 +1,21 @@
-name: xaj-dev
+name: xaj
 channels:
   - pytorch
   - conda-forge
   - defaults
 dependencies:
   - python=3.10
   - ipykernel
-  - numpy
   - numba
-  - pandas
   - scikit-learn
   - deap
   - spotpy=1.5.14
-  - seaborn
-  - tqdm
   - yaml
   - bmipy
-  # for dev 
   - pyarrow
-  - hydroerr
-  - xarray
-  - pytorch=1.12.1
-  - torchvision=0.13.1
-  - torchaudio=0.12.1
-  - cudatoolkit=11.3
-  - tensorboard
-  - sphinx
   - pytest
+  # for development
+  - sphinx
   - black
   - flake8
   # pip
@@ -36,7 +25,5 @@ dependencies:
     - wheel
     - twine
     - bump2version
+    - muskingumcunge
     - hydrodataset
-    # config for deep learning
-    - hydra-core
-    - accelerate
diff --git a/environment.yml b/environment.yml
diff --git a/hydromodel/app/show_results.ipynb b/hydromodel/app/show_results.ipynb
diff --git a/hydromodel/cli.py b/hydromodel/cli.py
diff --git a/hydromodel/common.py b/hydromodel/common.py
diff --git a/hydromodel/calibrate/__init__.py → hydromodel/datasets/__init__.py b/hydromodel/calibrate/__init__.py → hydromodel/datasets/__init__.py
diff --git a/hydromodel/data/camels_format_data.py → hydromodel/datasets/camels_format_data.py b/hydromodel/data/camels_format_data.py → hydromodel/datasets/camels_format_data.py
diff --git a/hydromodel/data/data_postprocess.py → hydromodel/datasets/data_postprocess.py b/hydromodel/data/data_postprocess.py → hydromodel/datasets/data_postprocess.py
diff --git a/hydromodel/data/data_preprocess.py → hydromodel/datasets/data_preprocess.py b/hydromodel/data/data_preprocess.py → hydromodel/datasets/data_preprocess.py
@@ -20,7 +20,7 @@
 from hydroutils import hydro_time, hydro_file
 
 sys.path.append(os.path.dirname(Path(os.path.abspath(__file__)).parent.parent))
-from hydromodel.data import camels_format_data
+from hydromodel.datasets import camels_format_data
 
 
 def trans_camels_format_to_xaj_format(

diff --git a/hydromodel/utils/dmca_esr.py → hydromodel/datasets/dmca_esr.py b/hydromodel/utils/dmca_esr.py → hydromodel/datasets/dmca_esr.py
diff --git a/hydromodel/utils/units.py → hydromodel/datasets/units.py b/hydromodel/utils/units.py → hydromodel/datasets/units.py
diff --git a/hydromodel/example/__init__.py b/hydromodel/example/__init__.py