Skip to content

Commit e3302b9

Browse files
committed
install numpy from conda
to fix the mkl-fft conflict
1 parent f029094 commit e3302b9

3 files changed

Lines changed: 34 additions & 32 deletions

File tree

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ imageio==2.3.0
77
kiwisolver==1.0.1
88
matplotlib==2.2.2
99
networkx==2.1
10-
numpy==1.15.0
10+
#numpy==1.15.0
1111
opencv-python==4.2.0.34
1212
pandas==0.23.4
1313
Pillow==6.2.2

‎scripts/install.sh‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
1-
#!/usr/bin/env bash
2-
3-
# check prerequisites
4-
command -v conda >/dev/null 2>&1 || { echo >&2 "conda not found. Please refer to the README and install Miniconda."; exit 1; }
5-
command -v git >/dev/null 2>&1 || { echo >&2 "git not found. Please refer to the README and install Git."; exit 1; }
6-
7-
source scripts/settings.sh
8-
9-
# v4l2loopback
10-
if [[ ! $@ =~ "no-vcam" ]]; then
11-
rm -rf v4l2loopback 2> /dev/null
12-
git clone https://github.com/alievk/v4l2loopback.git
13-
echo "--- Installing v4l2loopback (sudo privelege required)"
14-
cd v4l2loopback
15-
make && sudo make install
16-
sudo depmod -a
17-
cd ..
18-
fi
19-
20-
source $(conda info --base)/etc/profile.d/conda.sh
21-
conda create -y -n $CONDA_ENV_NAME python=3.7
22-
conda activate $CONDA_ENV_NAME
23-
24-
conda install -y pytorch==1.0.0 torchvision==0.2.1 cuda100 -c pytorch
25-
conda install -y python-blosc==1.7.0 -c conda-forge
26-
27-
# FOMM
28-
rm -rf fomm 2> /dev/null
29-
git clone https://github.com/alievk/first-order-model.git fomm
30-
31-
pip install -r requirements.txt
1+
#!/usr/bin/env bash
2+
3+
# check prerequisites
4+
command -v conda >/dev/null 2>&1 || { echo >&2 "conda not found. Please refer to the README and install Miniconda."; exit 1; }
5+
command -v git >/dev/null 2>&1 || { echo >&2 "git not found. Please refer to the README and install Git."; exit 1; }
6+
7+
source scripts/settings.sh
8+
9+
# v4l2loopback
10+
if [[ ! $@ =~ "no-vcam" ]]; then
11+
rm -rf v4l2loopback 2> /dev/null
12+
git clone https://github.com/alievk/v4l2loopback.git
13+
echo "--- Installing v4l2loopback (sudo privelege required)"
14+
cd v4l2loopback
15+
make && sudo make install
16+
sudo depmod -a
17+
cd ..
18+
fi
19+
20+
source $(conda info --base)/etc/profile.d/conda.sh
21+
conda create -y -n $CONDA_ENV_NAME python=3.7
22+
conda activate $CONDA_ENV_NAME
23+
24+
conda install -y -c conda-forge numpy==1.15.0
25+
conda install -y pytorch==1.0.0 torchvision==0.2.1 cuda100 -c pytorch
26+
conda install -y python-blosc==1.7.0 -c conda-forge
27+
28+
# FOMM
29+
rm -rf fomm 2> /dev/null
30+
git clone https://github.com/alievk/first-order-model.git fomm
31+
32+
pip install -r requirements.txt

‎scripts/install_windows.bat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ call scripts/settings_windows.bat
99
call conda create -y -n %CONDA_ENV_NAME% python=3.7
1010
call conda activate %CONDA_ENV_NAME%
1111

12+
call conda install -y -c conda-forge numpy==1.15.0
1213
call conda install -y pytorch==1.0.0 torchvision==0.2.1 cuda100 -c pytorch
1314
call conda install -y python-blosc==1.7.0 -c conda-forge
1415
call conda install -y -c anaconda git

0 commit comments

Comments
 (0)