diff --git a/demos/cluster_serving/init-occlum-taskmanager.sh b/demos/cluster_serving/init-occlum-taskmanager.sh index ba945a00..1e3ad3fd 100755 --- a/demos/cluster_serving/init-occlum-taskmanager.sh +++ b/demos/cluster_serving/init-occlum-taskmanager.sh @@ -13,7 +13,6 @@ init_instance() { .resource_limits.kernel_space_heap_size="64MB" | .resource_limits.max_num_of_threads = 72 | .process.default_heap_size = "128MB" | - .process.default_mmap_size = "6600MB" | .entry_points = [ "/usr/lib/jvm/java-11-openjdk-amd64/bin" ] | .env.default = [ "LD_LIBRARY_PATH=/usr/lib/jvm/java-11-openjdk-amd64/lib/server:/usr/lib/jvm/java-11-openjdk-amd64/lib:/usr/lib/jvm/java-11-openjdk-amd64/../lib:/lib:/opt/occlum/glibc/lib/", "OMP_NUM_THREADS=1", "KMP_AFFINITY=verbose,granularity=fine,compact,1,0", "KMP_BLOCKTIME=20" ]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/fish/run_per_process_config_test.sh b/demos/fish/run_per_process_config_test.sh index 57ef1d1f..de266e7c 100755 --- a/demos/fish/run_per_process_config_test.sh +++ b/demos/fish/run_per_process_config_test.sh @@ -14,7 +14,6 @@ new_json="$(jq '.resource_limits.user_space_size = "512MB" | .resource_limits.kernel_space_heap_size= "64MB" | .process.default_stack_size = "1MB" | .process.default_heap_size = "1MB" | - .process.default_mmap_size = "10MB" | .env.default = [ "OCCLUM=yes", "HOME=/root" ]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/flink/run_flink_on_occlum_glibc.sh b/demos/flink/run_flink_on_occlum_glibc.sh index 43ced5ab..d4d27204 100755 --- a/demos/flink/run_flink_on_occlum_glibc.sh +++ b/demos/flink/run_flink_on_occlum_glibc.sh @@ -19,7 +19,6 @@ init_instance() { .resource_limits.max_num_of_threads = 64 | .process.default_heap_size = "128MB" | .resource_limits.kernel_space_heap_size="64MB" | - .process.default_mmap_size = "5000MB" | .entry_points = [ "/usr/lib/jvm/java-11-openjdk-amd64/bin" ] | .env.default = [ "LD_LIBRARY_PATH=/usr/lib/jvm/java-11-openjdk-amd64/lib/server:/usr/lib/jvm/java-11-openjdk-amd64/lib:/usr/lib/jvm/java-11-openjdk-amd64/../lib:/lib" ]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/font/font_support_for_java/run_java_font_app_internal.sh b/demos/font/font_support_for_java/run_java_font_app_internal.sh index 4381035e..93cac346 100755 --- a/demos/font/font_support_for_java/run_java_font_app_internal.sh +++ b/demos/font/font_support_for_java/run_java_font_app_internal.sh @@ -22,7 +22,6 @@ init_instance() { .resource_limits.kernel_space_heap_size="64MB" | .resource_limits.max_num_of_threads = 64 | .process.default_heap_size = "256MB" | - .process.default_mmap_size = "1120MB" | .entry_points = [ "/usr/lib/jvm/java-11-alibaba-dragonwell/jre/bin" ] | .env.default = [ "LD_LIBRARY_PATH=/usr/lib/jvm/java-11-alibaba-dragonwell/jre/lib/server:/usr/lib/jvm/java-11-alibaba-dragonwell/jre/lib:/usr/lib/jvm/java-11-alibaba-dragonwell/jre/../lib" ]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/golang/go_sqlite/run_go_sqlite_demo.sh b/demos/golang/go_sqlite/run_go_sqlite_demo.sh index 286176ac..75181848 100755 --- a/demos/golang/go_sqlite/run_go_sqlite_demo.sh +++ b/demos/golang/go_sqlite/run_go_sqlite_demo.sh @@ -20,8 +20,7 @@ new_json="$(jq '.resource_limits.user_space_size = "2560MB" | .resource_limits.kernel_space_heap_size="320MB" | .resource_limits.kernel_space_stack_size="10MB" | .process.default_stack_size = "40MB" | - .process.default_heap_size = "320MB" | - .process.default_mmap_size = "960MB" ' Occlum.json)" && \ + .process.default_heap_size = "320MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # Copy program into Occlum Workspace and build diff --git a/demos/golang/grpc_benchmark/run_occlum_bench.sh b/demos/golang/grpc_benchmark/run_occlum_bench.sh index f0f9ce16..3649ace4 100755 --- a/demos/golang/grpc_benchmark/run_occlum_bench.sh +++ b/demos/golang/grpc_benchmark/run_occlum_bench.sh @@ -43,8 +43,7 @@ rm -rf occlum_client && mkdir occlum_client cd occlum_client occlum init new_json="$(jq '.resource_limits.user_space_size = "2048MB" | - .resource_limits.max_num_of_threads = 96 | - .process.default_mmap_size = "300MB"' Occlum.json)" && \ + .resource_limits.max_num_of_threads = 96 ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy program into Occlum Workspace and build @@ -56,8 +55,7 @@ occlum build cd ../occlum_server occlum init new_json="$(jq '.resource_limits.user_space_size = "2048MB" | - .resource_limits.max_num_of_threads = 96 | - .process.default_mmap_size = "300MB"' Occlum.json)" && \ + .resource_limits.max_num_of_threads = 96 ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy program into Occlum Workspace and build diff --git a/demos/golang/vault/run_occlum_vault_server.sh b/demos/golang/vault/run_occlum_vault_server.sh index 9a0cc3dd..1eac486b 100755 --- a/demos/golang/vault/run_occlum_vault_server.sh +++ b/demos/golang/vault/run_occlum_vault_server.sh @@ -20,8 +20,7 @@ new_json="$(jq '.resource_limits.user_space_size = "2560MB" | .resource_limits.kernel_space_heap_size="320MB" | .resource_limits.kernel_space_stack_size="10MB" | .process.default_stack_size = "40MB" | - .process.default_heap_size = "320MB" | - .process.default_mmap_size = "960MB" ' Occlum.json)" && \ + .process.default_heap_size = "320MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy executable into Occlum Workspace and build diff --git a/demos/golang/web_server/run_golang_on_occlum.sh b/demos/golang/web_server/run_golang_on_occlum.sh index a1121ca1..c9074f9f 100755 --- a/demos/golang/web_server/run_golang_on_occlum.sh +++ b/demos/golang/web_server/run_golang_on_occlum.sh @@ -16,8 +16,7 @@ fi rm -rf occlum_instance && mkdir occlum_instance cd occlum_instance occlum init -new_json="$(jq '.resource_limits.user_space_size = "1000MB" | - .process.default_mmap_size = "900MB"' Occlum.json)" && \ +new_json="$(jq '.resource_limits.user_space_size = "1000MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy program into Occlum Workspace and build diff --git a/demos/java/run_java_on_occlum.sh b/demos/java/run_java_on_occlum.sh index 1c7d5b5f..46b5fcc4 100755 --- a/demos/java/run_java_on_occlum.sh +++ b/demos/java/run_java_on_occlum.sh @@ -28,7 +28,6 @@ init_instance() { .resource_limits.kernel_space_heap_size="64MB" | .resource_limits.max_num_of_threads = 64 | .process.default_heap_size = "256MB" | - .process.default_mmap_size = "1400MB" | .entry_points = [ "/usr/lib/jvm/java-11-alibaba-dragonwell/jre/bin" ] | .env.default = [ "LD_LIBRARY_PATH=/usr/lib/jvm/java-11-alibaba-dragonwell/jre/lib/server:/usr/lib/jvm/java-11-alibaba-dragonwell/jre/lib:/usr/lib/jvm/java-11-alibaba-dragonwell/jre/../lib" ]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/openvino/run_benchmark_on_occlum.sh b/demos/openvino/run_benchmark_on_occlum.sh index aae8b5a1..f15285ea 100755 --- a/demos/openvino/run_benchmark_on_occlum.sh +++ b/demos/openvino/run_benchmark_on_occlum.sh @@ -15,12 +15,10 @@ cpu_cc=`cat /proc/cpuinfo | grep processor | wc -l` # .resource_limits.kernel_space_heap_size = "128MB" | # .resource_limits.kernel_space_stack_size = "16MB" | # .resource_limits.max_num_of_threads = 128 | -# .process.default_mmap_size = "1024MB" | # .process.default_stack_size = "8MB" | # .process.default_heap_size = "32MB" | # .metadata.debuggable = false ' Occlum.json)" && \ -new_json="$(jq '.resource_limits.user_space_size = "320MB" | - .process.default_mmap_size = "256MB"' Occlum.json)" && \ +new_json="$(jq '.resource_limits.user_space_size = "320MB"' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy files into Occlum Workspace and Build diff --git a/demos/python/flask/build_occlum_instance.sh b/demos/python/flask/build_occlum_instance.sh index d28e80f6..7f0750a2 100755 --- a/demos/python/flask/build_occlum_instance.sh +++ b/demos/python/flask/build_occlum_instance.sh @@ -18,7 +18,6 @@ fi new_json="$(jq '.resource_limits.user_space_size = "640MB" | .resource_limits.kernel_space_heap_size = "256MB" | - .process.default_mmap_size = "512MB" | .env.default += ["PYTHONHOME=/opt/python-occlum"]' Occlum.json)" && \ echo "${new_json}" > Occlum.json occlum build diff --git a/demos/python/python_musl/run_python_on_occlum.sh b/demos/python/python_musl/run_python_on_occlum.sh index 4cddd1df..68188138 100755 --- a/demos/python/python_musl/run_python_on_occlum.sh +++ b/demos/python/python_musl/run_python_on_occlum.sh @@ -21,8 +21,7 @@ if [ ! -d "image/lib/python3.7" ];then rm -rf image copy_bom -f ../python_musl.yaml --root image --include-dir /opt/occlum/etc/template new_json="$(jq '.resource_limits.user_space_size = "320MB" | - .resource_limits.kernel_space_heap_size = "256MB" | - .process.default_mmap_size = "256MB"' Occlum.json)" && \ + .resource_limits.kernel_space_heap_size = "256MB"' Occlum.json)" && \ echo "${new_json}" > Occlum.json occlum build fi diff --git a/demos/redis/run_occlum_redis.sh b/demos/redis/run_occlum_redis.sh index f8a08ce4..5d20fd08 100755 --- a/demos/redis/run_occlum_redis.sh +++ b/demos/redis/run_occlum_redis.sh @@ -8,8 +8,7 @@ bomfile=${SCRIPT_DIR}/redis.yaml rm -rf occlum_instance occlum new occlum_instance cd occlum_instance -new_json="$(jq '.resource_limits.user_space_size = "320MB" | - .process.default_mmap_size = "256MB"' Occlum.json)" && \ +new_json="$(jq '.resource_limits.user_space_size = "320MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json # 2. Copy files into Occlum Workspace and Build diff --git a/demos/redis/run_occlum_redis_glibc.sh b/demos/redis/run_occlum_redis_glibc.sh index 1d6edce0..328fc86b 100755 --- a/demos/redis/run_occlum_redis_glibc.sh +++ b/demos/redis/run_occlum_redis_glibc.sh @@ -8,8 +8,7 @@ bomfile=${SCRIPT_DIR}/redis_glibc.yaml rm -rf occlum_instance occlum new occlum_instance cd occlum_instance -new_json="$(jq '.resource_limits.user_space_size = "320MB" | - .process.default_mmap_size = "256MB"' Occlum.json)" && \ +new_json="$(jq '.resource_limits.user_space_size = "320MB" ' Occlum.json)" && \ echo "${new_json}" > Occlum.json rm -rf image diff --git a/demos/sofaboot/run_sofaboot_on_occlum.sh b/demos/sofaboot/run_sofaboot_on_occlum.sh index c13fd5b3..79535f3e 100755 --- a/demos/sofaboot/run_sofaboot_on_occlum.sh +++ b/demos/sofaboot/run_sofaboot_on_occlum.sh @@ -21,7 +21,6 @@ init_instance() { .resource_limits.kernel_space_heap_size="64MB" | .resource_limits.max_num_of_threads = 64 | .process.default_heap_size = "256MB" | - .process.default_mmap_size = "1400MB" | .entry_points = [ "/usr/lib/jvm/java-11-alibaba-dragonwell/jre/bin" ] | .env.default = [ "LD_LIBRARY_PATH=/usr/lib/jvm/java-11-alibaba-dragonwell/jre/lib/server:/usr/lib/jvm/java-11-alibaba-dragonwell/jre/lib:/usr/lib/jvm/java-11-alibaba-dragonwell/jre/../lib" ]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh b/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh index b292a98d..e2aae975 100755 --- a/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh +++ b/demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh @@ -21,7 +21,6 @@ init_instance() { .resource_limits.kernel_space_heap_size="64MB" | .resource_limits.max_num_of_threads = 64 | .process.default_heap_size = "256MB" | - .process.default_mmap_size = "1400MB" | .entry_points = [ "/usr/lib/jvm/java-1.8-openjdk/jre/bin" ] | .env.default = [ "LD_LIBRARY_PATH=/usr/lib/jvm/java-1.8-openjdk/jre/lib:/usr/lib/jvm/java-1.8-openjdk/lib" ]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh b/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh index 2bb4b91c..922c4e6b 100755 --- a/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh +++ b/demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh @@ -22,7 +22,6 @@ new_json="$(jq '.resource_limits.user_space_size = "7000MB" | .resource_limits.kernel_space_heap_size="384MB" | .process.default_heap_size = "128MB" | .resource_limits.max_num_of_threads = 64 | - .process.default_mmap_size = "6000MB" | .env.default = [ "OMP_NUM_THREADS=8", "KMP_AFFINITY=verbose,granularity=fine,compact,1,0", "KMP_BLOCKTIME=20", "MKL_NUM_THREADS=8"]' Occlum.json)" && \ echo "${new_json}" > Occlum.json diff --git a/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh b/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh index de330e72..2f8d8fb8 100755 --- a/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh +++ b/demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh @@ -21,7 +21,6 @@ if [ ! -L "image/bin/python3" ];then 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" | .resource_limits.max_num_of_threads = 64 | .env.default += ["PYTHONHOME=/opt/python-occlum", "OMP_NUM_THREADS=1"]' Occlum.json)" && \ echo "${new_json}" > Occlum.json