From f2d2b585e316b31cab8069488a436e558b180569 Mon Sep 17 00:00:00 2001
From: Mehrdad <mehrdadn@users.noreply.github.com>
Date: Wed, 22 Jun 2016 11:42:04 -0700
Subject: [PATCH] Split up and polish build scripts

---
 .travis.yml        |  4 +++-
 README.md          |  4 ++++
 build.sh           |  9 +++++++++
 rebuild.sh         | 16 ----------------
 scripts/cluster.py | 36 +++++++++++++++++++++++++++++++-----
 setup-env.sh       |  7 +++++++
 setup.sh           | 27 +++++++++++++--------------
 7 files changed, 67 insertions(+), 36 deletions(-)
 create mode 100755 build.sh
 delete mode 100755 rebuild.sh
 create mode 100755 setup-env.sh

diff --git a/.travis.yml b/.travis.yml
index 084e35be9..ece578f4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,11 @@ before_install:
   - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo add-apt-repository --yes ppa:kalakris/cmake ; fi
 
 install:
-  - bash setup.sh
+  - ./setup.sh
+  - ./build.sh
 
 script:
+  - source setup-env.sh
   - cd test
   - python runtest.py
   - python arrays_test.py
diff --git a/README.md b/README.md
index 416acc71c..e506e2cd9 100644
--- a/README.md
+++ b/README.md
@@ -22,11 +22,15 @@ For a description of our design decisions, see
 
 ### Linux, Mac, and other Unix-based systems
 
+After running these instruction, add the line `source "$RAY_ROOT/setup-env.sh"` in your `~/.bashrc` file manually, where "$RAY_ROOT" is the path of the directory containing `setup-env.sh`.
+
 1. sudo apt-get update
 2. sudo apt-get install git
 3. git clone https://github.com/amplab/ray.git
 4. cd ray
 5. ./setup.sh
+6. ./build.sh
+7. source setup-env.sh
 
 ### Windows
 
diff --git a/build.sh b/build.sh
new file mode 100755
index 000000000..031f2f023
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
+
+mkdir -p "$ROOT_DIR/build"
+pushd "$ROOT_DIR/build"
+  cmake ..
+  make install
+popd
diff --git a/rebuild.sh b/rebuild.sh
deleted file mode 100755
index 82c0c1980..000000000
--- a/rebuild.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ ! -f "src/computation_graph.cc" ]; then
-  echo "Exiting this script because we may be in the wrong directory and we don't want to accidentally delete files."
-  exit
-fi
-
-rm -rf build/*
-pushd build
-  cmake ..
-  make install
-popd
-
-pushd lib/python
-  sudo python setup.py install
-popd
diff --git a/scripts/cluster.py b/scripts/cluster.py
index 258ccc525..868fb84f0 100644
--- a/scripts/cluster.py
+++ b/scripts/cluster.py
@@ -24,7 +24,16 @@ def run_command_over_ssh(node_ip_address, username, key_file, command):
 
 def install_ray_multi_node(node_ip_addresses, username, key_file, installation_directory):
   def install_ray_over_ssh(node_ip_address, username, key_file, installation_directory):
-    install_ray_command = "sudo apt-get update; sudo apt-get -y install git; mkdir -p {}; cd {}; git clone https://github.com/amplab/ray; cd ray; ./setup.sh".format(installation_directory, installation_directory)
+    install_ray_command = """
+      sudo apt-get update &&
+      sudo apt-get -y install git &&
+      mkdir -p "{}" &&
+      cd "{}" &&
+      git clone "https://github.com/amplab/ray";
+      cd ray;
+      ./setup.sh;
+      ./build.sh
+    """.format(installation_directory, installation_directory)
     run_command_over_ssh(node_ip_address, username, key_file, install_ray_command)
   threads = []
   for node_ip_address in node_ip_addresses:
@@ -36,17 +45,28 @@ def install_ray_multi_node(node_ip_addresses, username, key_file, installation_d
 
 def start_ray_multi_node(node_ip_addresses, username, key_file, worker_path, installation_directory):
   build_directory = os.path.join(installation_directory, "ray/build")
-  start_scheduler_command = "cd {}; nohup ./scheduler {}:10001 > scheduler.out 2> scheduler.err < /dev/null &".format(build_directory, node_ip_addresses[0])
+  start_scheduler_command = """
+    cd "{}";
+    nohup ./scheduler {}:10001 > scheduler.out 2> scheduler.err < /dev/null &
+  """.format(build_directory, node_ip_addresses[0])
   run_command_over_ssh(node_ip_addresses[0], username, key_file, start_scheduler_command)
 
   for i, node_ip_address in enumerate(node_ip_addresses):
     scripts_directory = os.path.join(installation_directory, "ray/scripts")
-    start_workers_command = "cd {}; python start_workers.py --scheduler-address={}:10001 --node-ip={} --worker-path={} > start_workers.out 2> start_workers.err < /dev/null &".format(scripts_directory, node_ip_addresses[0], node_ip_addresses[i], worker_path)
+    start_workers_command = """
+      cd "{}";
+      source ../setup-env.sh;
+      python start_workers.py --scheduler-address={}:10001 --node-ip={} --worker-path="{}" > start_workers.out 2> start_workers.err < /dev/null &
+    """.format(scripts_directory, node_ip_addresses[0], node_ip_addresses[i], worker_path)
     run_command_over_ssh(node_ip_address, username, key_file, start_workers_command)
 
   print "cluster started; you can start the shell on the head node with:"
+  setup_env_path = os.path.join(args.installation_directory, "ray/setup-env.sh")
   shell_script_path = os.path.join(args.installation_directory, "ray/scripts/shell.py")
-  print "python {} --scheduler-address={}:10001 --objstore-address={}:20001 --worker-address={}:30001".format(shell_script_path, node_ip_addresses[0], node_ip_addresses[0], node_ip_addresses[0])
+  print """
+    source "{}";
+    python "{}" --scheduler-address={}:10001 --objstore-address={}:20001 --worker-address={}:30001
+  """.format(setup_env_path, shell_script_path, node_ip_addresses[0], node_ip_addresses[0], node_ip_addresses[0])
 
 def stop_ray_multi_node(node_ip_addresses, username, key_file):
   kill_cluster_command = "killall scheduler objstore python > /dev/null 2> /dev/null"
@@ -55,7 +75,13 @@ def stop_ray_multi_node(node_ip_addresses, username, key_file):
 
 def update_ray_multi_node(node_ip_addresses, username, key_file, installation_directory):
   ray_directory = os.path.join(installation_directory, "ray")
-  update_cluster_command = "cd {}; git pull; ./rebuild.sh".format(ray_directory)
+  update_cluster_command = """
+    cd "{}" &&
+    git fetch &&
+    git reset --hard "@{{upstream}}" -- &&
+    (make -C "./build" clean || rm -rf "./build") &&
+    ./build.sh
+  """.format(ray_directory)
   for node_ip_address in node_ip_addresses:
     run_command_over_ssh(node_ip_address, username, key_file, update_cluster_command)
 
diff --git a/setup-env.sh b/setup-env.sh
new file mode 100755
index 000000000..235f3bd52
--- /dev/null
+++ b/setup-env.sh
@@ -0,0 +1,7 @@
+# NO shebang! Force the user to run this using the 'source' command without spawning a new shell; otherwise, variable exports won't persist.
+
+echo "Adding Ray to PYTHONPATH" 1>&2
+
+ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
+
+export PYTHONPATH="$ROOT_DIR/lib/python/:$ROOT_DIR/thirdparty/numbuf/python"
diff --git a/setup.sh b/setup.sh
index 288dc8fec..3979a1a75 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,7 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
 
 platform="unknown"
-unamestr=`uname`
+unamestr="$(uname)"
 if [[ "$unamestr" == "Linux" ]]; then
   echo "Platform is linux."
   platform="linux"
@@ -36,15 +38,12 @@ elif [[ $platform == "macosx" ]]; then
   sudo pip install numpy
   sudo pip install -r requirements.txt --ignore-installed six
 fi
-cd thirdparty
-./download_thirdparty.sh
-./build_thirdparty.sh
-cd numbuf
-cd python
-sudo python setup.py install
-mkdir -p ../../../build
-cd ../../../build
-cmake ..
-make install
-cd ../lib/python
-sudo python setup.py install
+pushd "$ROOT_DIR/thirdparty"
+  ./download_thirdparty.sh
+  ./build_thirdparty.sh
+  pushd numbuf
+    pushd python
+      sudo python setup.py install
+    popd
+  popd
+popd