diff --git a/.github/workflows/reusable-test.yml b/.github/workflows/reusable-test.yml index 7813949..364b6e1 100644 --- a/.github/workflows/reusable-test.yml +++ b/.github/workflows/reusable-test.yml @@ -17,10 +17,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v4 with: - python-version: "3.11" + python-version: "3.12" - uses: actions/cache@v3 id: venv-cache diff --git a/README.md b/README.md index 587bd63..2cec9c6 100644 --- a/README.md +++ b/README.md @@ -206,9 +206,9 @@ To get a local copy up and running, follow the following steps. # Installation ## Windows ### Anaconda -1. Create a new environment using the supplied `environment.yml` file: +1. Create a new environment using the supplied `environment_win_linux.yml` file: ```sh - conda env create -f environment.yml + conda env create -f environment_win_linux.yml ``` 2. Activate the environment: ```sh @@ -233,9 +233,9 @@ To get a local copy up and running, follow the following steps. sudo apt-get install -y portaudio19-dev ``` ### Anaconda -1. Create a new environment using the supplied `environment.yml` file: +1. Create a new environment using the supplied `environment_win_linux.yml` file: ```sh - conda env create -f environment.yml + conda env create -f environment_win_linux.yml ``` 2. Activate the environment: ```sh @@ -275,9 +275,9 @@ To get a local copy up and running, follow the following steps.
### Anaconda -1. Create a new environment using the supplied `environment.yml` file: +1. Create a new environment using the supplied `environment_osx.yml` file: ```sh - conda env create -f environment.yml + conda env create -f environment_osx.yml ``` 2. Activate the environment: ```sh diff --git a/environment_osx.yml b/environment_osx.yml new file mode 100644 index 0000000..17a4880 --- /dev/null +++ b/environment_osx.yml @@ -0,0 +1,242 @@ +name: research-analytics-suite +channels: + - conda-forge + - defaults + - pytorch +dependencies: + - openblas + - libopenblas + - numpy # Ensure numpy is built with openblas + - scipy # Ensure scipy is built with openblas + - aioconsole + - aiofiles + - aiosqlite + - anaconda-anon-usage + - anaconda-client + - anaconda-cloud-auth + - anaconda-navigator + - annotated-types + - anyio + - asttokens + - attrs + - backcall + - beautifulsoup4 + - bleach + - bleak + - boltons + - bottleneck + - brotli + - brotli-bin + - brotli-python + - boto3 + - botocore + - cachetools + - ca-certificates + - certifi + - cffi + - chardet + - charset-normalizer + - click + - cloudpickle + - colorama + - conda + - conda-content-trust + - conda-package-handling + - conda-package-streaming + - conda-repo-cli + - conda-token + - console_shortcut + - contourpy + - cryptography + - cycler + - dask[dataframe] + - dask-core + - dask-expr + - decorator + - defusedxml + - diskcache + - dnspython + - docopt + - et_xmlfile + - exceptiongroup + - executing + - fastavro + - fastparquet + - filelock + - fonttools + - freetype + - fsspec + - h11 + - h5py + - hdf5 + - h2 + - hpack + - httpcore + - hyperframe + - icu + - idna + - importlib-metadata + - importlib_resources + - intel-openmp + - ipython + - jaraco.classes + - jedi + - jinja2 + - jmespath + - joblib + - jpeg + - jsonpatch + - jsonpointer + - jsonschema + - jsonschema-specifications + - jupyter_core + - keras + - keyring + - kiwisolver + - krb5 + - lerc + - libblas + - libbrotlicommon + - libbrotlidec + - libbrotlienc + - libcblas + - libclang + - libclang13 + - libdeflate + - libffi + - liblapack + - libpng + - libpq + - libtiff + - libwebp-base + - locket + - lz4-c + - markupsafe + - matplotlib + - matplotlib-base + - matplotlib-inline + - menuinst + - mistune + - mpmath + - more-itertools + - navigator-updater + - nbclient + - nbconvert + - nbformat + - networkx + - nest-asyncio + - numexpr + - numpy + - numpy-base + - openjpeg + - openpyxl + - openssl + - packaging + - pandas + - pandocfilters + - paramiko + - parso + - partd + - patsy + - pickleshare + - pip + - pipreqs + - pkce + - pkgutil-resolve-name + - platformdirs + - pluggy + - ply + - prettytable + - prompt-toolkit + - psutil + - pyaudio + - pycosat + - pycparser + - pydantic + - pydantic-core + - pygments + - pyjwt + - pymongo + - pyopenssl + - pyparsing + - pytest + - pytest-asyncio + - pytest-cov + - pyqt + - pyqt5-sip + - pyqtwebengine + - pyserial + - pyserial-asyncio + - pysocks + - pytables + - python + - python_abi + - python-dateutil + - python-dotenv + - python-fastjsonschema + - python-tzdata + - pytz + - pynvml + - pywin32 + - pywin32-ctypes + - pyyaml + - pyzmq + - qt-main + - qt-webengine + - qtpy + - referencing + - requests + - requests-toolbelt + - rich + - rpds-py + - ruamel.yaml + - ruamel.yaml.clib + - s3transfer + - scikit-learn + - scipy + - semver + - setuptools + - sip + - six + - snappy + - sniffio + - soupsieve + - statsmodels + - sqlite + - sympy + - tbb + - threadpoolctl + - tinycss2 + - tomli + - toolz + - pytorch + - torchaudio + - torchvision + - tornado + - tqdm + - traitlets + - typing_extensions + - ujson + - unicodedata2 + - urllib3 + - vc + - vs2015_runtime + - wcwidth + - webencodings + - wheel + - win_inet_pton + - xz + - yaml + - yarg + - zipp + - zlib + - zstandard + - zstd + - pip: + - dearpygui + - dearpygui-async + - jupyterlab-pygments + - jupyter-client + - pillow + - pure-eval + - tensorflow diff --git a/environment.yml b/environment_win_linux.yml similarity index 91% rename from environment.yml rename to environment_win_linux.yml index 8737097..79afefb 100644 --- a/environment.yml +++ b/environment_win_linux.yml @@ -5,6 +5,10 @@ channels: - defaults - pytorch dependencies: + - mkl + - mkl-service + - mkl_fft + - mkl_random - aioconsole - aiofiles - aiosqlite @@ -206,7 +210,7 @@ dependencies: - tinycss2 - tomli - toolz - - torch + - pytorch - torchaudio - torchvision - tornado @@ -229,14 +233,6 @@ dependencies: - zlib - zstandard - zstd - - sel(win, linux): mkl - - sel(win, linux): mkl-service - - sel(win, linux): mkl_fft - - sel(win, linux): mkl_random - - sel(osx): openblas - - sel(osx): libopenblas - - sel(osx): numpy # Ensure numpy is built with openblas - - sel(osx): scipy # Ensure scipy is built with openblas - pip: - dearpygui - dearpygui-async diff --git a/requirements.txt b/requirements.txt index c5c6856..19ad492 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # Research Analytics Suite (RAS) Requirements # platform: win-64 | osx-64 | linux-64 -# python: 3.11 +# python: 3.12 # This file may be used to install the required packages using: # $ pip install -r requirements.txt @@ -54,7 +54,7 @@ s3transfer scikit-learn scipy statsmodels -torch +pytorch torchaudio torchvision tornado