From 02660d5f11b3f3e42f444e9ea312a62d25aa1c42 Mon Sep 17 00:00:00 2001
From: Kevin Pedro <kpedro88@gmail.com>
Date: Thu, 4 Oct 2018 16:35:31 -0500
Subject: [PATCH] updates to setup script

---
 README.md | 2 +-
 setup.sh  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1f0806d..5fae896 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ https://github.com/cms-smpj/SMPJ/tree/v1.0/
 
 For this branch, please use the following script to set up the work area and associated tools (`grpc`,`tensorflow-serving`,`miniconda`,`aml-real-time-ai`):
 ```
-wget https://raw.githubusercontent.com/hls-fpga-machine-learning/SonicCMS/kjp/1020_azureml/setup.sh
+wget https://raw.githubusercontent.com/hls-fpga-machine-learning/SonicCMS/kjp/1020_azureml_ew/setup.sh
 chmod +x setup.sh
 ./setup.sh
 cd CMSSW_10_2_0/src
diff --git a/setup.sh b/setup.sh
index 1007ee1..ae100e8 100755
--- a/setup.sh
+++ b/setup.sh
@@ -114,10 +114,12 @@ cd $CMSSW_BASE/..
 # setup miniconda
 wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
 bash Miniconda3-latest-Linux-x86_64.sh -b -p $CMSSW_BASE/../miniconda3
-source /uscms_data/d3/pedrok/phase2/brainwave/test/miniconda3/etc/profile.d/conda.sh
+source $CMSSW_BASE/../miniconda3/etc/profile.d/conda.sh
 
 # setup aml
 git clone https://github.com/Azure/aml-real-time-ai
+# temporarily remove jupyter b/c issue with conda and pip
+sed -i '/jupyter/d' aml-real-time-ai/environment.yml
 miniconda3/bin/conda env create -f aml-real-time-ai/environment.yml
 
 # to get working version
@@ -128,5 +130,5 @@ ln -s $CMSSWTF $AMLDIR/tensorflow
 # get the analysis code
 cd $CMSSW_BASE/src
 git cms-init
-git clone git@github.com:hls-fpga-machine-learning/SonicCMS -b "kjp/1020_azureml"
+git clone https://github.com/hls-fpga-machine-learning/SonicCMS -b "kjp/1020_azureml_ew"
 scram b -j 8