Merge pull request #14 from NWC-CUAHSI-Summer-Institute/add-NN

Add nn

environment.yml

@@ -17,5 +17,6 @@ dependencies:
  - tqdm
  - scikit-learn
  - pip
+ conda install -c mullenkamp eto
  - pip:
  - hydra-core

environment_full.yml

@@ -0,0 +1,252 @@
+name: dCFE
+channels:
+ - pytorch
+ - conda-forge
+ - defaults
+dependencies:
+ - anyio=3.7.0
+ - argon2-cffi=21.3.0
+ - argon2-cffi-bindings=21.2.0
+ - asttokens=2.2.1
+ - async-lru=2.0.2
+ - attrs=23.1.0
+ - babel=2.12.1
+ - backcall=0.2.0
+ - backports=1.1
+ - backports.functools_lru_cache=1.6.5
+ - beautifulsoup4=4.12.2
+ - black=23.3.0
+ - blas=2.117
+ - blas-devel=3.9.0
+ - bleach=6.0.0
+ - bmipy=2.0
+ - bokeh=3.2.0
+ - brotli=1.0.9
+ - brotli-bin=1.0.9
+ - brotli-python=1.0.9
+ - bzip2=1.0.8
+ - ca-certificates=2023.05.30
+ - certifi=2023.5.7
+ - cffi=1.15.1
+ - cftime=1.6.2
+ - charset-normalizer=3.1.0
+ - click=8.1.3
+ - colorama=0.4.6
+ - comm=0.1.3
+ - contourpy=1.1.0
+ - cpuonly=2.0
+ - curl=8.1.2
+ - cycler=0.11.0
+ - debugpy=1.6.7
+ - decorator=5.1.1
+ - defusedxml=0.7.1
+ - entrypoints=0.4
+ - exceptiongroup=1.1.1
+ - executing=1.2.0
+ - filelock=3.12.2
+ - fonttools=4.40.0
+ - freetype=2.12.1
+ - gettext=0.21.1
+ - glib=2.76.3
+ - glib-tools=2.76.3
+ - gst-plugins-base=1.22.4
+ - gstreamer=1.22.4
+ - hdf4=4.2.15
+ - hdf5=1.14.0
+ - icu=72.1
+ - idna=3.4
+ - importlib-metadata=6.7.0
+ - importlib_metadata=6.7.0
+ - importlib_resources=5.12.0
+ - intel-openmp=2023.1.0
+ - ipykernel=6.23.3
+ - ipython=8.14.0
+ - ipython_genutils=0.2.0
+ - ipywidgets=8.0.6
+ - jedi=0.18.2
+ - jinja2=3.1.2
+ - joblib=1.3.0
+ - json5=0.9.6
+ - jsonschema=4.17.3
+ - jupyter=1.0.0
+ - jupyter-lsp=2.2.0
+ - jupyter_client=8.3.0
+ - jupyter_console=6.6.3
+ - jupyter_core=5.3.1
+ - jupyter_events=0.6.3
+ - jupyter_server=2.7.0
+ - jupyter_server_terminals=0.4.4
+ - jupyterlab=4.0.2
+ - jupyterlab_pygments=0.2.2
+ - jupyterlab_server=2.23.0
+ - jupyterlab_widgets=3.0.7
+ - kiwisolver=1.4.4
+ - krb5=1.20.1
+ - lcms2=2.15
+ - lerc=4.0.0
+ - libaec=1.0.6
+ - libblas=3.9.0
+ - libbrotlicommon=1.0.9
+ - libbrotlidec=1.0.9
+ - libbrotlienc=1.0.9
+ - libcblas=3.9.0
+ - libclang=16.0.3
+ - libclang13=16.0.3
+ - libcurl=8.1.2
+ - libdeflate=1.18
+ - libexpat=2.5.0
+ - libffi=3.4.4
+ - libglib=2.76.3
+ - libhwloc=2.9.1
+ - libiconv=1.17
+ - libjpeg-turbo=2.1.5.1
+ - liblapack=3.9.0
+ - liblapacke=3.9.0
+ - libnetcdf=4.9.2
+ - libogg=1.3.5
+ - libpng=1.6.39
+ - libsodium=1.0.18
+ - libsqlite=3.42.0
+ - libssh2=1.11.0
+ - libtiff=4.5.1
+ - libuv=1.44.2
+ - libvorbis=1.3.7
+ - libwebp-base=1.3.1
+ - libxcb=1.15
+ - libxml2=2.10.4
+ - libzip=1.9.2
+ - libzlib=1.2.13
+ - m2w64-gcc-libgfortran=5.3.0
+ - m2w64-gcc-libs=5.3.0
+ - m2w64-gcc-libs-core=5.3.0
+ - m2w64-gmp=6.1.0
+ - m2w64-libwinpthread-git=5.0.0.4634.697f757
+ - markupsafe=2.1.3
+ - matplotlib=3.7.1
+ - matplotlib-base=3.7.1
+ - matplotlib-inline=0.1.6
+ - mistune=3.0.0
+ - mkl=2022.1.0
+ - mkl-devel=2022.1.0
+ - mkl-include=2022.1.0
+ - mpmath=1.3.0
+ - msys2-conda-epoch=20160418
+ - munkres=1.1.4
+ - mypy_extensions=1.0.0
+ - nbclassic=1.0.0
+ - nbclient=0.8.0
+ - nbconvert=7.6.0
+ - nbconvert-core=7.6.0
+ - nbconvert-pandoc=7.6.0
+ - nbformat=5.9.0
+ - nest-asyncio=1.5.6
+ - netcdf4=1.6.4
+ - networkx=3.1
+ - notebook=6.5.4
+ - notebook-shim=0.2.3
+ - numpy=1.25.0
+ - openjpeg=2.5.0
+ - openssl=3.1.1
+ - overrides=7.3.1
+ - packaging=23.1
+ - pandas=2.0.3
+ - pandoc=3.1.3
+ - pandocfilters=1.5.0
+ - parso=0.8.3
+ - pathspec=0.11.1
+ - pcre2=10.40
+ - pickleshare=0.7.5
+ - pillow=9.5.0
+ - pip=23.1.2
+ - platformdirs=3.8.0
+ - ply=3.11
+ - pooch=1.7.0
+ - prometheus_client=0.17.0
+ - prompt-toolkit=3.0.38
+ - prompt_toolkit=3.0.38
+ - psutil=5.9.5
+ - pthread-stubs=0.4
+ - pthreads-win32=2.9.1
+ - pure_eval=0.2.2
+ - pycparser=2.21
+ - pygments=2.15.1
+ - pyparsing=3.1.0
+ - pyqt=5.15.7
+ - pyqt5-sip=12.11.0
+ - pyrsistent=0.19.3
+ - pysocks=1.7.1
+ - python=3.11.4
+ - python-dateutil=2.8.2
+ - python-fastjsonschema=2.17.1
+ - python-json-logger=2.0.7
+ - python-tzdata=2023.3
+ - python_abi=3.11
+ - pytorch=2.0.1
+ - pytorch-mutex=1.0
+ - pytz=2023.3
+ - pywin32=305
+ - pywinpty=2.0.10
+ - pyyaml=6.0
+ - pyzmq=25.1.0
+ - qt-main=5.15.8
+ - qtconsole=5.4.3
+ - qtconsole-base=5.4.3
+ - qtpy=2.3.1
+ - requests=2.31.0
+ - rfc3339-validator=0.1.4
+ - rfc3986-validator=0.1.1
+ - ruamel.yaml=0.17.32
+ - ruamel.yaml.clib=0.2.7
+ - scikit-learn=1.3.0
+ - scipy=1.11.1
+ - send2trash=1.8.2
+ - setuptools=68.0.0
+ - sip=6.7.9
+ - six=1.16.0
+ - sniffio=1.3.0
+ - soupsieve=2.4
+ - stack_data=0.6.2
+ - sympy=1.12
+ - tbb=2021.9.0
+ - terminado=0.17.1
+ - threadpoolctl=3.2.0
+ - tinycss2=1.2.1
+ - tk=8.6.12
+ - toml=0.10.2
+ - tomli=2.0.1
+ - torchdiffeq=0.2.2
+ - tornado=6.3.2
+ - tqdm=4.65.0
+ - traitlets=5.9.0
+ - typing-extensions=4.7.0
+ - typing_extensions=4.7.0
+ - typing_utils=0.1.0
+ - tzdata=2023c
+ - ucrt=10.0.22621.0
+ - urllib3=2.0.3
+ - vc=14.3
+ - vc14_runtime=14.36.32532
+ - vs2015_runtime=14.36.32532
+ - wcwidth=0.2.6
+ - webencodings=0.5.1
+ - websocket-client=1.6.1
+ - wheel=0.40.0
+ - widgetsnbextension=4.0.7
+ - win_inet_pton=1.1.0
+ - winpty=0.4.3
+ - xorg-libxau=1.0.11
+ - xorg-libxdmcp=1.1.3
+ - xyzservices=2023.5.0
+ - xz=5.4.2
+ - yaml=0.2.5
+ - zeromq=4.3.4
+ - zipp=3.15.0
+ - zstd=1.5.2
+ - pip:
+ - antlr4-python3-runtime==4.9.3
+ - hydra-core==1.3.2
+ - hydroeval==0.1.0
+ - omegaconf==2.3.0
+ - python-graphviz==0.20.1
+ - torchviz==0.0.2
+prefix: C:\Users\flipl\miniconda3\envs\dCFE

src/__main__.py

@@ -18,10 +18,14 @@ def main(cfg: DictConfig) -> None:
  start = time.perf_counter()
  print(f"Running in {cfg.run_type} mode")
  log.info(f"{cfg.run_type}")
+
+ # For running ML against observed data ("ML") or synthetic data ("ML_synthetic_test")
  if (cfg.run_type == "ML") | (cfg.run_type == "ML_synthetic_test"):
- agent = DifferentiableCFE(cfg) # For Running against Observed Data
+ agent = DifferentiableCFE(cfg) 
+ # For generating synthetic timesreies
  elif cfg.run_type == "generate_synthetic":
  agent = SyntheticAgent(cfg)
+
  agent.run()
  agent.finalize()
  end = time.perf_counter()