From 936dd4107fe109b0717c87583116ce35c4f3fae0 Mon Sep 17 00:00:00 2001
From: Kathlene Magnus <kathlene.hurt@gmail.com>
Date: Fri, 31 May 2024 10:17:52 -0500
Subject: [PATCH] Ubuntu and MacOs should be able to use the same Conda env yml

---
 .github/workflows/conda/macos_env.yml | 158 --------------------------
 .github/workflows/macos-build.yml     |   4 +-
 2 files changed, 2 insertions(+), 160 deletions(-)
 delete mode 100644 .github/workflows/conda/macos_env.yml

diff --git a/.github/workflows/conda/macos_env.yml b/.github/workflows/conda/macos_env.yml
deleted file mode 100644
index 8012e288..00000000
--- a/.github/workflows/conda/macos_env.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-name: riscv_perf_model
-channels:
-  - conda-forge
-dependencies:
-  - appnope=0.1.3=pyhd8ed1ab_0
-  - asttokens=2.4.0=pyhd8ed1ab_0
-  - backcall=0.2.0=pyh9f0ad1d_0
-  - backports=1.0=pyhd8ed1ab_3
-  - backports.functools_lru_cache=1.6.5=pyhd8ed1ab_0
-  - boost=1.78.0=py310h3e792ce_4
-  - boost-cpp=1.78.0=hf5ba120_3
-  - brotli=1.1.0=h0dc2134_1
-  - brotli-bin=1.1.0=h0dc2134_1
-  - brotli-python=1.1.0=py310h9e9d8ca_1
-  - bzip2=1.0.8=h0d85af4_4
-  - c-ares=1.20.1=h10d778d_0
-  - ca-certificates=2023.7.22=h8857fd0_0
-  - cairo=1.16.0=h09dd18c_1016
-  - cctools_osx-64=973.0.1=habff3f6_15
-  - certifi=2023.7.22=pyhd8ed1ab_0
-  - charset-normalizer=3.3.0=pyhd8ed1ab_0
-  - clang=15.0.7=h694c41f_3
-  - clang-15=15.0.7=default_hdb78580_3
-  - clang_osx-64=15.0.7=h03d6864_3
-  - clangxx=15.0.7=default_hdb78580_3
-  - clangxx_osx-64=15.0.7=h2133e9c_3
-  - cmake=3.27.6=hf40c264_0
-  - compiler-rt=15.0.7=he1888fc_1
-  - compiler-rt_osx-64=15.0.7=he1888fc_1
-  - contourpy=1.1.1=py310h88cfcbd_1
-  - cppcheck=2.12.1=py310h15cda10_1
-  - cycler=0.12.1=pyhd8ed1ab_0
-  - cython=3.0.3=py310had63691_0
-  - decorator=5.1.1=pyhd8ed1ab_0
-  - doxygen=1.9.8=hd7636e7_0
-  - exceptiongroup=1.1.3=pyhd8ed1ab_0
-  - executing=1.2.0=pyhd8ed1ab_0
-  - expat=2.5.0=hf0c8a7f_1
-  - font-ttf-dejavu-sans-mono=2.37=hab24e00_0
-  - font-ttf-inconsolata=3.000=h77eed37_0
-  - font-ttf-source-code-pro=2.038=h77eed37_0
-  - font-ttf-ubuntu=0.83=hab24e00_0
-  - fontconfig=2.14.2=h5bb23bf_0
-  - fonts-conda-ecosystem=1=0
-  - fonts-conda-forge=1=0
-  - fonttools=4.43.1=py310hb372a2b_0
-  - freetype=2.12.1=h60636b9_2
-  - gettext=0.21.1=h8a4c099_0
-  - gmp=6.2.1=h2e338ed_0
-  - graphite2=1.3.13=h2e338ed_1001
-  - harfbuzz=7.3.0=h413ba03_0
-  - hdf5=1.12.2=nompi_h48135f9_101
-  - icu=72.1=h7336db1_0
-  - idna=3.4=pyhd8ed1ab_0
-  - ipython=8.16.1=pyh31c8845_0
-  - jedi=0.19.1=pyhd8ed1ab_0
-  - kiwisolver=1.4.5=py310h88cfcbd_1
-  - krb5=1.21.2=hb884880_0
-  - lcms2=2.15=h2dcdeff_1
-  - ld64_osx-64=609=h0fd476b_15
-  - lerc=4.0.0=hb486fe8_0
-  - libaec=1.1.2=he965462_1
-  - libblas=3.9.0=18_osx64_openblas
-  - libbrotlicommon=1.1.0=h0dc2134_1
-  - libbrotlidec=1.1.0=h0dc2134_1
-  - libbrotlienc=1.1.0=h0dc2134_1
-  - libcblas=3.9.0=18_osx64_openblas
-  - libclang-cpp15=15.0.7=default_hdb78580_3
-  - libcurl=8.4.0=h726d00d_0
-  - libcxx=16.0.6=hd57cbcb_0
-  - libdeflate=1.18=hac1461d_0
-  - libedit=3.1.20191231=h0678c8f_2
-  - libev=4.33=haf1e3a3_1
-  - libexpat=2.5.0=hf0c8a7f_1
-  - libffi=3.4.2=h0d85af4_5
-  - libgfortran=5.0.0=13_2_0_h97931a8_1
-  - libgfortran5=13.2.0=h2873a65_1
-  - libglib=2.78.0=hc62aa5d_0
-  - libiconv=1.17=hac89ed1_0
-  - libjpeg-turbo=2.1.5.1=h0dc2134_1
-  - liblapack=3.9.0=18_osx64_openblas
-  - libllvm15=15.0.7=he4b1e75_3
-  - libnghttp2=1.52.0=he2ab024_0
-  - libopenblas=0.3.24=openmp_h48a4ad5_0
-  - libpng=1.6.39=ha978bb4_0
-  - libsqlite=3.43.2=h92b6c6a_0
-  - libssh2=1.11.0=hd019ec5_0
-  - libtiff=4.5.1=hf955e92_1
-  - libuv=1.46.0=h0c2f820_0
-  - libwebp-base=1.3.2=h0dc2134_0
-  - libxcb=1.15=hb7f2c08_0
-  - libxml2=2.11.5=hd95e348_0
-  - libzlib=1.2.13=h8a1eda9_5
-  - llvm-openmp=17.0.2=hff08bdf_0
-  - llvm-tools=15.0.7=he4b1e75_3
-  - lz4-c=1.9.4=hf0c8a7f_0
-  - make=4.3=h22f3db7_1
-  - matplotlib-base=3.7.2=py310h475a17b_0
-  - matplotlib-inline=0.1.6=pyhd8ed1ab_0
-  - mpfr=4.2.0=h4f9bd69_0
-  - munkres=1.1.4=pyh9f0ad1d_0
-  - ncurses=6.4=hf0c8a7f_0
-  - numpy=1.21.6=py310hb608527_0
-  - openjpeg=2.5.0=h13ac156_2
-  - openssl=3.1.3=h8a1eda9_0
-  - packaging=23.2=pyhd8ed1ab_0
-  - parso=0.8.3=pyhd8ed1ab_0
-  - pathlib2=2.3.7.post1=py310h2ec42d9_3
-  - pcre=8.45=he49afe7_0
-  - pcre2=10.40=h1c4e4bc_0
-  - pexpect=4.8.0=pyh1a96a4e_2
-  - pickleshare=0.7.5=py_1003
-  - pillow=10.0.0=py310hd63a8c7_0
-  - pip=23.2.1=pyhd8ed1ab_0
-  - pixman=0.42.2=he965462_0
-  - popt=1.16=h7b079dc_2002
-  - prompt-toolkit=3.0.39=pyha770c72_0
-  - prompt_toolkit=3.0.39=hd8ed1ab_0
-  - pthread-stubs=0.4=hc929b4f_1001
-  - ptyprocess=0.7.0=pyhd3deb0d_0
-  - pure_eval=0.2.2=pyhd8ed1ab_0
-  - pygments=2.16.1=pyhd8ed1ab_0
-  - pyparsing=3.0.9=pyhd8ed1ab_0
-  - pysocks=1.7.1=pyha2e5f31_6
-  - python=3.10.12=had23ca6_0_cpython
-  - python-dateutil=2.8.2=pyhd8ed1ab_0
-  - python.app=1.4=py310h6729b98_3
-  - python_abi=3.10=4_cp310
-  - pyyaml=6.0.1=py310h6729b98_1
-  - rapidjson=1.1.0=hb1e8313_1002
-  - readline=8.2=h9e318b2_1
-  - requests=2.31.0=pyhd8ed1ab_0
-  - rhash=1.4.4=h0dc2134_0
-  - rsync=3.2.7=h30d983d_0
-  - setuptools=68.2.2=pyhd8ed1ab_0
-  - sigtool=0.1.3=h88f4db0_0
-  - six=1.16.0=pyh6c4a22f_0
-  - sqlite=3.43.2=h7461747_0
-  - stack_data=0.6.2=pyhd8ed1ab_0
-  - tapi=1100.0.11=h9ce4665_0
-  - texlive-core=20230313=h25b69a2_5
-  - tk=8.6.13=hef22860_0
-  - traitlets=5.11.2=pyhd8ed1ab_0
-  - typing_extensions=4.8.0=pyha770c72_0
-  - tzdata=2023c=h71feb2d_0
-  - unicodedata2=15.1.0=py310h6729b98_0
-  - urllib3=2.0.6=pyhd8ed1ab_0
-  - wcwidth=0.2.8=pyhd8ed1ab_0
-  - wheel=0.41.2=pyhd8ed1ab_0
-  - wxpython=4.2.1=py310h12da54f_0
-  - xorg-libxau=1.0.11=h0dc2134_0
-  - xorg-libxdmcp=1.1.3=h35c211d_0
-  - xxhash=0.8.0=h35c211d_3
-  - xz=5.2.6=h775f41a_0
-  - yaml=0.2.5=h0d85af4_2
-  - yaml-cpp=0.8.0=he965462_0
-  - zlib=1.2.13=h8a1eda9_5
-  - zstd=1.5.5=h829000d_0
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
index 8e6805d2..4ba1fb2e 100644
--- a/.github/workflows/macos-build.yml
+++ b/.github/workflows/macos-build.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Cache conda deps
         uses: actions/cache@v3
         with:
-          key: ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-conda-${{ hashFiles('.github/workflows/conda/macos_env.yml') }}
+          key: ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-conda-${{ hashFiles('conda/environment.yml') }}
           path: /usr/share/miniconda/envs/riscv_perf_model # Default path for conda
 
       # Setup CCache to cache builds
@@ -66,7 +66,7 @@ jobs:
         run: |
           # $CONDA is an environment variable pointing to the root of the miniconda directory
           $CONDA/bin/conda config --set channel_priority strict
-          $CONDA/bin/conda env update --file  ${{ github.workspace }}/.github/workflows/conda/macos_env.yml
+          $CONDA/bin/conda env update --file  ${{ github.workspace }}/conda/environment.yml
           $CONDA/bin/conda init bash
 
       # Build