Skip to content

Commit

Permalink
updated mac yml, fix for kdepy
Browse files Browse the repository at this point in the history
  • Loading branch information
wjm41 committed Jan 19, 2023
1 parent 4f2da16 commit b8ce493
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 125 deletions.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,13 @@ Functions for utilising FRESCO can be used as a python library by importing the

The conda environment used for generating the results in the paper can be recreated by running `conda env create -f environment.yml` or `environment_mac.yml` in the root directory of the repo. The `fresco` module has to be installed in this environment via `pip install .*` in the root directory of the repo.

This has been tested on intel macOS and on linux. Currently figuring out how to get the environment working on Apple silicon macOS!
This has been tested on intel macOS and on linux. For apple silicon macOS, it seems like `kdepy` is causing an issue, so the `environment_mac.yml` file does not include `kdepy` - to install that, run:
```
git clone git@github.com:tommyod/KDEpy.git
cd KDEpy
pip install .
```
as detailed [here](https://github.com/tommyod/KDEpy/issues/114).

## Example

Expand Down
31 changes: 15 additions & 16 deletions environment_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ name: fresco
channels:
- defaults
dependencies:
- ca-certificates=2022.10.11=hecd8cb5_0
- certifi=2022.12.7=py37hecd8cb5_0
- libffi=3.4.2=hecd8cb5_6
- ncurses=6.3=hca72f7f_3
- openssl=1.1.1s=hca72f7f_0
- pip=22.3.1=py37hecd8cb5_0
- python=3.7.15=h218abb5_1
- readline=8.2=hca72f7f_0
- setuptools=65.6.3=py37hecd8cb5_0
- sqlite=3.40.1=h880c91c_0
- tk=8.6.12=h5d9f67b_0
- wheel=0.37.1=pyhd3eb1b0_0
- xz=5.2.8=h6c40b1e_0
- zlib=1.2.13=h4dc903c_0
- ca-certificates=2022.10.11
- certifi=2022.12.7
- libffi=3.4.2
- ncurses=6.3
- openssl=1.1.1s
- pip=22.3.1
- python=>3.7
- readline=8.2
- setuptools=65.6.3
- sqlite=3.40.1
- tk=8.6.12
- wheel=0.37.1
- xz=5.2.8
- zlib=1.2.13
- pip:
- anyio==3.6.2
- appnope==0.1.3
Expand Down Expand Up @@ -50,7 +50,6 @@ dependencies:
- jupyter-server==1.23.5
- jupyterlab-pygments==0.2.2
- jupyterlab-widgets==3.0.5
- kdepy==1.1.0
- kiwisolver==1.4.4
- markupsafe==2.1.1
- matplotlib==3.5.3
Expand Down Expand Up @@ -105,4 +104,4 @@ dependencies:
- webencodings==0.5.1
- websocket-client==1.4.2
- widgetsnbextension==4.0.5
- zipp==3.11.0
- zipp==3.11.0
108 changes: 0 additions & 108 deletions environment_mac_2.yml

This file was deleted.

0 comments on commit b8ce493

Please sign in to comment.