Refactor data step, inference step, Jupyter notebooks

.github/workflows/linting.yaml

@@ -30,6 +30,9 @@ jobs:
 
     - run: pip install mypy
 
+    - name: Install relevant Python type stub libraries
+      run: pip install types-requests
+
     - name: mypy
       run: mypy --strict .
 

MLproject

@@ -1,20 +1,8 @@
-name: cmip2_6
+# vim: ft=yaml
 
-# conda_env: conda.yaml
+name: gz21_ocean_momentum
 
 entry_points:
-  main:
-    parameters:
-      ntimes : {type: float, default: 10000}
-      CO2: {type: float, default: 0}
-      lat_min : float
-      lat_max : float
-      long_min : float
-      long_max : float
-      factor: {type: float, default: 0}
-      chunk_size: {type: string, default: 50}
-      global: {type: str, default: 0}
-    command: "python src/gz21_ocean_momentum/cmip26.py {lat_min} {lat_max} {long_min} {long_max} --CO2 {CO2} --ntimes {ntimes} --factor {factor} --chunk_size {chunk_size} --global_ {global}"
 
   train:
     parameters:
@@ -35,9 +23,11 @@ entry_points:
       submodel : {type: string, default : transform3}
       features_transform_cls_name : {type : string, default : None}
       targets_transform_cls_name : {type : string, default : None}
+      subdomains_file: {type: string, default: resources/cli-configs/train-subdomains-paper.yaml}
     command: "python src/gz21_ocean_momentum/trainScript.py
         --run-id {run_id}
         --forcing-data-path {forcing_data_path}
+        --subdomains-file {subdomains_file}
         --batchsize {batchsize} --learning_rate {learning_rate}
         --n_epochs {n_epochs} --train_split {train_split}
         --test_split {test_split} --time_indices {time_indices}