From dd862165e01879e55f08bfd086b025dd3eb7754f Mon Sep 17 00:00:00 2001 From: David John Gagne Date: Tue, 13 Sep 2022 10:30:45 -0600 Subject: [PATCH 1/3] Added requirements.txt --- requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..196aec4 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +numpy +scipy +matplotlib +optuna +setuptools From 0da095ea4aa8454ba8a3b8e88b5edb9515a6f07a Mon Sep 17 00:00:00 2001 From: David John Gagne Date: Tue, 6 Dec 2022 14:24:26 -0700 Subject: [PATCH 2/3] Added setup.cfg file and updated requirements to reflect libraries being imported by echo-opt. --- LICENSE | 2 +- echo/VERSION | 1 + environment.yml | 6 ------ requirements.txt | 8 ++++++++ setup.cfg | 47 +++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 13 ++----------- 6 files changed, 59 insertions(+), 18 deletions(-) create mode 100644 echo/VERSION create mode 100644 setup.cfg diff --git a/LICENSE b/LICENSE index 999c82f..ca29379 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 National Center for Atmospheric Research +Copyright (c) 2021 University Corporation for Atmospheric Research Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/echo/VERSION b/echo/VERSION new file mode 100644 index 0000000..ceab6e1 --- /dev/null +++ b/echo/VERSION @@ -0,0 +1 @@ +0.1 \ No newline at end of file diff --git a/environment.yml b/environment.yml index 7cf3360..1b2415e 100644 --- a/environment.yml +++ b/environment.yml @@ -11,18 +11,12 @@ dependencies: - numpy - scipy - matplotlib - - seaborn - - xarray - - netcdf4 - - tqdm - - dask - scikit-learn - jupyter - jupyterlab - jupyter_server - distributed - pip - - s3fs - pyarrow - pytorch - torchvision diff --git a/requirements.txt b/requirements.txt index 196aec4..5bb4a0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,13 @@ numpy scipy matplotlib +pandas optuna setuptools +pyyaml +scikit-learn +tensorflow +pytorch +xgboost +torchvision +pyarrow \ No newline at end of file diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..09d4e31 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,47 @@ +[metadata] +name = echo-opt +description = Earth Computer Hyperparameter Optimization: Distributed hyperparameter optimization on HPC and GPU systems with analysis tools. +long_description = file: README.md +long_description_content_type = text/markdown +author = John Schreck +author_email = schreck@ucar.edu +license = MIT +license_file = LICENSE +platform = any +version = file: echo/VERSION +keywords = machine-learning, hyperparameter, gpu +classifiers = + Programming Language :: Python + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 +url = https://github.com/NCAR/echo-opt + +[options] +zip_safe = True +packages = + echo + echo.src +include_package_data = True +setup_requires = setuptools +python_requires = >=3.7 +install_requires = + numpy + scipy + matplotlib + optuna + setuptools + pandas + scikit-learn + tensorflow + pytorch + xgboost + torchvision + pyarrow + pyyaml + +[options.entry_points] +console_scripts = + echo-opt = echo.optimize:main + echo-run = echo.run:main + echo-report = echo.report:main diff --git a/setup.py b/setup.py index 3ff28fe..7f1a176 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,4 @@ from setuptools import setup -setup(name="echo-opt", - version="0.1", - description="Earth Computer Hyperparameter Optimization", - author="John Schreck, David John Gagne, Charlie Becker, Gabrielle Gantos, Keely Lawrence", - license="MIT", - url="https://github.com/NCAR/echo-opt", - packages=["echo", "echo/src"], - entry_points = { - 'console_scripts': ['echo-opt=echo.optimize:main', 'echo-run=echo.run:main', 'echo-report=echo.report:main'], - } - ) \ No newline at end of file +if __name__ == "__main__": + setup() From 3a2d8ee1551136b7ca4afa5b06d0b8c4674cc79e Mon Sep 17 00:00:00 2001 From: David John Gagne Date: Tue, 6 Dec 2022 14:42:06 -0700 Subject: [PATCH 3/3] Fixed pip install requirements to use torch instead of pytorch --- requirements.txt | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5bb4a0d..050b7c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ setuptools pyyaml scikit-learn tensorflow -pytorch +torch xgboost torchvision pyarrow \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 09d4e31..3b13b40 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,7 +34,7 @@ install_requires = pandas scikit-learn tensorflow - pytorch + torch xgboost torchvision pyarrow