add platform to build directory (apache#8945)

ylc · Sep 29, 2021 · db48e2e · db48e2e
1 parent 9701ec5
commit db48e2e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 50 deletions.
diff --git a/apps/microtvm/reference-vm/arduino/provision_setup.sh b/apps/microtvm/reference-vm/arduino/provision_setup.sh
@@ -22,7 +22,8 @@ set -ex
 # NOTE: TVM is presumed to be mounted already by Vagrantfile.
 cd "${TVM_HOME}"
 
-apps/microtvm/reference-vm/rebuild-tvm.sh
+platform="arduino"
+apps/microtvm/reference-vm/rebuild-tvm.sh ${platform}
 
 # Build poetry
 cd apps/microtvm/reference-vm/arduino
@@ -43,6 +44,6 @@ echo "------------------------------[ TVM Message ]-----------------------------
 poetry lock -vvv
 poetry install
 
-echo "export TVM_LIBRARY_PATH=\"$TVM_HOME\"/build-microtvm" >>~/.profile
+echo "export TVM_LIBRARY_PATH=\"$TVM_HOME\"/build-microtvm-${platform}" >>~/.profile
 echo "VENV_PATH=\$((cd \"$TVM_HOME\"/apps/microtvm/reference-vm/arduino && poetry env list --full-path) | sed -E 's/^(.*)[[:space:]]\(Activated\)\$/\1/g')" >>~/.profile
 echo "source \$VENV_PATH/bin/activate" >>~/.profile
diff --git a/apps/microtvm/reference-vm/rebuild-tvm.sh b/apps/microtvm/reference-vm/rebuild-tvm.sh
@@ -15,9 +15,20 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+# "Usage ./apps/microtvm/reference-vm/rebuild-tvm.sh <PLATFORM>"
+#
 
 set -e
 
+if [ "$#" -lt 1 -o "$1" == "--help" ]; then
+    echo "Usage ./apps/microtvm/reference-vm/rebuild-tvm.sh <PLATFORM>"
+    exit -1
+fi
+
+platform=$1
+shift 1
+
 # Get number of cores for build
 if [ -n "${TVM_CI_NUM_CORES}" ]; then
   num_cores=${TVM_CI_NUM_CORES}
@@ -28,7 +39,7 @@ fi
 
 cd "$(dirname $0)"
 cd "$(git rev-parse --show-toplevel)"
-BUILD_DIR=build-microtvm
+BUILD_DIR="build-microtvm-${platform}"
 
 if [ ! -e "${BUILD_DIR}" ]; then
     mkdir "${BUILD_DIR}"

diff --git a/apps/microtvm/reference-vm/zephyr/provision_setup.sh b/apps/microtvm/reference-vm/zephyr/provision_setup.sh
@@ -22,7 +22,8 @@ set -ex
 # NOTE: TVM is presumed to be mounted already by Vagrantfile.
 cd "${TVM_HOME}"
 
-apps/microtvm/reference-vm/rebuild-tvm.sh
+platform="zephyr"
+apps/microtvm/reference-vm/rebuild-tvm.sh ${platform}
 
 # Build poetry
 cd apps/microtvm/reference-vm/zephyr
@@ -44,7 +45,7 @@ poetry lock -vvv
 poetry install
 poetry run pip3 install -r ${ZEPHYR_BASE}/scripts/requirements.txt
 
-echo "export TVM_LIBRARY_PATH=\"$TVM_HOME\"/build-microtvm" >>~/.profile
+echo "export TVM_LIBRARY_PATH=\"$TVM_HOME\"/build-microtvm-${platform}" >>~/.profile
 echo "VENV_PATH=\$((cd \"$TVM_HOME\"/apps/microtvm/reference-vm/zephyr && poetry env list --full-path) | sed -E 's/^(.*)[[:space:]]\(Activated\)\$/\1/g')" >>~/.profile
 echo "source \$VENV_PATH/bin/activate" >>~/.profile
 echo "export PATH=\"\${PATH}:\${HOME}/zephyr-sdk/sysroots/x86_64-pokysdk-linux/usr/bin\"" >>~/.profile
diff --git a/apps/microtvm/reference-vm/zephyr/rebuild-tvm.sh b/apps/microtvm/reference-vm/zephyr/rebuild-tvm.sh
diff --git a/tutorials/micro/micro_reference_vm.py b/tutorials/micro/micro_reference_vm.py
@@ -111,13 +111,13 @@
 Rebuilding TVM inside the Reference VM
 --------------------------------------
 
-After the first boot, you'll need to ensure you keep the build, in ``$TVM_HOME/build-microtvm``,
+After the first boot, you'll need to ensure you keep the build, in ``$TVM_HOME/build-microtvm-zephyr``,
 up-to-date when you modify the C++ runtime or checkout a different revision. You can either
 re-provision the machine (``vagrant provision`` in the same directory you ran ``vagrant up`` before)
 or manually rebuild TVM yourself.
 
 Remember: the TVM ``.so`` built inside the VM is different from the one you may use on your host
-machine. This is why it's built inside the special directory ``build-microtvm``.
+machine. This is why it's built inside the special directory ``build-microtvm-zephyr``.
 
 Logging in to the VM
 --------------------