Moved scripts to scripts dir

Author: Shillaker

README.md

@@ -65,7 +65,7 @@ we use [crossenv](https://github.com/benfogle/crossenv).
 To set up crossenv:
 
 ```
-./crossenv_setup.sh
+./scripts/crossenv_setup.sh
 ```
 
 You can then activate with:
@@ -77,7 +77,7 @@ You can then activate with:
 From inside the virtual environment, you can inspect the set-up with:
 
 ```
-python sanity_check.py | less
+python scripts/sanity_check.py | less
 ```
 
 This will display the environment used to install Python modules (including the
@@ -91,8 +91,8 @@ environment:
 
 - Modify the CPython build (see `tasks.py`)
 - Rerun the CPython build (`inv cpython --clean`) 
-- Rebuild the crossenv (`./crossenv_setup.sh`) 
-- Enter the crossenv and inspect the environment with `sanity_check.py`
+- Rebuild the crossenv (`./scripts/crossenv_setup.sh`) 
+- Enter the crossenv and inspect the environment with `scripts/sanity_check.py`
 
 ## Modules
 
@@ -101,7 +101,7 @@ With the crossenv activated, we can build modules with normal `pip`.
 To install all the modules, you can run:
 
 ```
-./install_modules.sh
+./scripts/install_modules.sh
 ```
 
 Libraries will then be installed to 

crossenv_setup.py scripts/crossenv_setup.pycrossenv_setup.py renamed to scripts/crossenv_setup.py

@@ -4,14 +4,12 @@
 
 from crossenv import CrossEnvBuilder
 
-THIS_DIR = dirname(abspath(__file__))
+PROJ_ROOT = dirname(dirname(abspath(__file__)))
 
-WASM_CPYTHON = join(THIS_DIR, "third-party", "cpython", "install", "wasm",
+WASM_CPYTHON = join(PROJ_ROOT, "third-party", "cpython", "install", "wasm",
                     "bin", "python3.8")
 
-CROSSENV_VENV_DIR = join(THIS_DIR, "cross_venv")
-
-# TODO - should this be the actual sysroot, or the Python install dir?
+CROSSENV_VENV_DIR = join(PROJ_ROOT, "cross_venv")
 CROSSENV_SYSROOT = "/usr/local/faasm/llvm-sysroot"
 
 
@@ -38,3 +36,4 @@ def main():
 
 if __name__ == "__main__":
     main()
+

crossenv_setup.sh scripts/crossenv_setup.shcrossenv_setup.sh renamed to scripts/crossenv_setup.sh

@@ -3,6 +3,7 @@
 set -e
 
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+PROJ_ROOT=${THIS_DIR}/..
 
 # NOTE - all the commands must use the specially-installed python 
 # on the build machine.
@@ -11,7 +12,7 @@ BUILD_PYTHON=${BUILD_PYTHON_BIN}/python3.8
 BUILD_PIP=${BUILD_PYTHON_BIN}/pip3.8
 
 # Install the build machine python dependencies
-CROSSENV_SRC_DIR=${THIS_DIR}/third-party/crossenv
+CROSSENV_SRC_DIR=${PROJ_ROOT}/third-party/crossenv
 echo "Installing crossenv from ${CROSSENV_SRC_DIR}"
 pushd ${CROSSENV_SRC_DIR} >> /dev/null
 ${BUILD_PIP} install -e .
@@ -20,10 +21,10 @@ echo "Installing cython"
 ${BUILD_PIP} install cython
 popd >> /dev/null
 
-pushd ${THIS_DIR} >> /dev/null
+pushd ${PROJ_ROOT} >> /dev/null
 
 # Run the set-up script
-${BUILD_PYTHON} crossenv_setup.py
+${BUILD_PYTHON} scripts/crossenv_setup.py
 
 # Enter the env and print details
 source cross_venv/bin/activate

install_modules.sh scripts/install_modules.shinstall_modules.sh renamed to scripts/install_modules.sh

@@ -3,19 +3,23 @@
 set -e
 
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+PROJ_ROOT=${THIS_DIR}/..
+SITE_PACKAGES=${PROJ_ROOT}/cross_venv/cross/lib/python3.8/site-packages
 
 # Start the cross-env
+pushd ${PROJ_ROOT} >> /dev/null
 source cross_venv/bin/activate
+popd >> /dev/null
 
 # Numpy (parallel build https://numpy.org/devdocs/user/building.html)
 export NPY_NUM_BUILD_JOBS=$(nproc --ignore 1)
 echo "Numpy using ${NPY_NUM_BUILD_JOBS} cores"
-pushd ${THIS_DIR}/third-party/numpy >> /dev/null
+pushd ${PROJ_ROOT}/third-party/numpy >> /dev/null
 pip install .
 popd >> /dev/null
 
 # Pyfaasm
-pushd ${THIS_DIR}/third-party/pyfaasm >> /dev/null
+pushd ${PROJ_ROOT}/third-party/pyfaasm >> /dev/null
 pip install .
 popd >> /dev/null