From 436e427fbf759dea1fbc6ee568f45754438f13b4 Mon Sep 17 00:00:00 2001
From: jianfengjiang <jiangjianfeng.jjf@antgroup.com>
Date: Sun, 26 Sep 2021 11:46:38 +0800
Subject: [PATCH] Update tensorflow demos with copy_bom

---
 .../run_occlum_tf_serving.sh                  | 14 ++-----------
 .../tensorflow_serving.yaml                   | 20 +++++++++++++++++++
 .../run_tensorflow_on_occlum.sh               | 10 ++--------
 .../tensorflow_training.yaml                  | 19 ++++++++++++++++++
 4 files changed, 43 insertions(+), 20 deletions(-)
 create mode 100644 demos/tensorflow/tensorflow_serving/tensorflow_serving.yaml
 create mode 100644 demos/tensorflow/tensorflow_training/tensorflow_training.yaml

diff --git a/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh b/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh
index 5b78f37b..2bb4b91c 100755
--- a/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh
+++ b/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh
@@ -27,18 +27,8 @@ new_json="$(jq '.resource_limits.user_space_size = "7000MB" |
 echo "${new_json}" > Occlum.json
 
 # 2. Copy files into Occlum Workspace and Build
-mkdir -p image/model
-cp -rf ../resnet50-v15-fp32  image/model/
-cp -rf ../ssl_configure  image/bin/
-cp ../tensorflow_model_server image/bin
-cp ../hosts image/etc/
-cp $occlum_glibc/libdl.so.2 image/$occlum_glibc
-cp $occlum_glibc/librt.so.1 image/$occlum_glibc
-cp $occlum_glibc/libm.so.6 image/$occlum_glibc
-cp $occlum_glibc/libutil.so.1 image/$occlum_glibc
-cp $occlum_glibc/libpthread.so.0 image/$occlum_glibc
-cp $occlum_glibc/libnss_files.so.2 image/$occlum_glibc
-cp $occlum_glibc/libnss_compat.so.2 image/$occlum_glibc
+rm -rf image
+copy_bom -f ../tensorflow_serving.yaml --root image --include-dir /opt/occlum/etc/template
 
 #occlum build
 occlum build
diff --git a/demos/tensorflow/tensorflow_serving/tensorflow_serving.yaml b/demos/tensorflow/tensorflow_serving/tensorflow_serving.yaml
new file mode 100644
index 00000000..50060538
--- /dev/null
+++ b/demos/tensorflow/tensorflow_serving/tensorflow_serving.yaml
@@ -0,0 +1,20 @@
+includes:
+  - base.yaml
+targets:
+  # copy model
+  - target: /model
+    copy: 
+      - dirs:
+        - ../resnet50-v15-fp32
+  - target: /bin
+    copy:
+      - from: ..
+        dirs:
+          - ssl_configure
+        files:
+          - tensorflow_model_server
+  # copy hosts
+  - target: /etc
+    copy: 
+      - files:
+        - ../hosts
diff --git a/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh b/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh
index 5d406d5a..de330e72 100755
--- a/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh
+++ b/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh
@@ -17,14 +17,8 @@ fi
 cd occlum_instance
 # Copy files into Occlum Workspace and build
 if [ ! -L "image/bin/python3" ];then
-    mkdir -p image/opt
-    cp -rf $python_dir image/opt/python-occlum
-    ln -s /opt/python-occlum/bin/python3 image/bin/python3
-    cp -f /opt/occlum/glibc/lib/libdl.so.2 image/opt/occlum/glibc/lib/
-    cp -f /opt/occlum/glibc/lib/libutil.so.1 image/opt/occlum/glibc/lib/
-    cp -f /opt/occlum/glibc/lib/librt.so.1 image/opt/occlum/glibc/lib/
-    cp -f ../demo.py image/bin
-    cp -f ../mnist.npz image/bin
+    rm -rf image
+    copy_bom -f ../tensorflow_training.yaml --root image --include-dir /opt/occlum/etc/template
     new_json="$(jq '.resource_limits.user_space_size = "5400MB" |
                     .resource_limits.kernel_space_heap_size = "512MB" |
                     .process.default_mmap_size = "5000MB" |
diff --git a/demos/tensorflow/tensorflow_training/tensorflow_training.yaml b/demos/tensorflow/tensorflow_training/tensorflow_training.yaml
new file mode 100644
index 00000000..3edcf4f5
--- /dev/null
+++ b/demos/tensorflow/tensorflow_training/tensorflow_training.yaml
@@ -0,0 +1,19 @@
+includes:
+  - base.yaml
+targets:
+  - target: /bin
+    createlinks:
+      - src: /opt/python-occlum/bin/python3
+        linkname: python3
+  # python packages
+  - target: /opt
+    copy: 
+      - dirs:
+          - ../python-occlum
+  # below are python code and data
+  - target: /bin
+    copy:
+      - from: ..
+        files: 
+          - demo.py
+          - mnist.npz