Skip to content

Commit 815f717

Browse files
committed
Make conda_path a command line argument.
1 parent 0acd1ed commit 815f717

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

package.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ _DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
55
# This script is for preparing the releases, conda environments, etc.
66

77

8-
CONDA_PATH="$HOME/opt/anaconda3/etc/profile.d/conda.sh"
8+
DEFAULT_CONDA_PATH="$HOME/opt/anaconda3/etc/profile.d/conda.sh"
99

1010

1111
function prepare_conda_env_cpu() {
12-
source ${CONDA_PATH}
12+
local conda_path=${1:$DEFAULT_CONDA_PATH}; shift
13+
source ${conda_path}
1314
conda env remove --name roosterize-cpu
1415
conda create --name roosterize-cpu python=3.7 pip -y
1516
conda activate roosterize-cpu
@@ -20,7 +21,8 @@ function prepare_conda_env_cpu() {
2021

2122

2223
function prepare_conda_env_gpu_cuda10() {
23-
source ${CONDA_PATH}
24+
local conda_path=${1:$DEFAULT_CONDA_PATH}; shift
25+
source ${conda_path}
2426
conda env remove --name roosterize-gpu
2527
conda create --name roosterize-gpu python=3.7 pip -y
2628
conda activate roosterize-gpu
@@ -31,7 +33,8 @@ function prepare_conda_env_gpu_cuda10() {
3133

3234

3335
function prepare_conda_env_gpu_cuda9() {
34-
source ${CONDA_PATH}
36+
local conda_path=${1:$DEFAULT_CONDA_PATH}; shift
37+
source ${conda_path}
3538
conda env remove --name roosterize-gpu
3639
conda create --name roosterize-gpu python=3.7 pip -y
3740
conda activate roosterize-gpu
@@ -43,7 +46,8 @@ function prepare_conda_env_gpu_cuda9() {
4346

4447
function prepare_conda_env_mac() {
4548
# This needs to be executed on a Mac
46-
source ${CONDA_PATH}
49+
local conda_path=${1:$DEFAULT_CONDA_PATH}; shift
50+
source ${conda_path}
4751
conda env remove --name roosterize-mac
4852
conda create --name roosterize-mac python=3.7 pip -y
4953
conda activate roosterize-mac
@@ -60,7 +64,8 @@ function package_dist() {
6064
#
6165
# requirements.txt contains the right CPU-only pytorch
6266
# packages for installation
63-
source ${CONDA_PATH}
67+
local conda_path=${1:$DEFAULT_CONDA_PATH}; shift
68+
source ${conda_path}
6469
conda env remove --name roosterize-package
6570
conda create --name roosterize-package python=3.7 pip -y
6671
conda activate roosterize-package

0 commit comments

Comments
 (0)