general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up unnecessary default_mmap_size configuration in demos

Browse Source
This commit is contained in:
Zheng, Qi 2022-12-21 15:19:24 +08:00 committed by volcano
parent d34d54a821
commit 22ff266958
18 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demos/cluster_serving/init-occlum-taskmanager.sh
View File

@ -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

1
demos/fish/run_per_process_config_test.sh
View File

@ -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

1
demos/flink/run_flink_on_occlum_glibc.sh
View File

@ -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

1
demos/font/font_support_for_java/run_java_font_app_internal.sh
View File

@ -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

3
demos/golang/go_sqlite/run_go_sqlite_demo.sh
View File

@ -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

6
demos/golang/grpc_benchmark/run_occlum_bench.sh
View File

@ -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

3
demos/golang/vault/run_occlum_vault_server.sh
View File

@ -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

3
demos/golang/web_server/run_golang_on_occlum.sh
View File

@ -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

1
demos/java/run_java_on_occlum.sh
View File

@ -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

4
demos/openvino/run_benchmark_on_occlum.sh
View File

@ -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

1
demos/python/flask/build_occlum_instance.sh
View File

@ -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

3
demos/python/python_musl/run_python_on_occlum.sh
View File

@ -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

3
demos/redis/run_occlum_redis.sh
View File

@ -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

3
demos/redis/run_occlum_redis_glibc.sh
View File

@ -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

1
demos/sofaboot/run_sofaboot_on_occlum.sh
View File

@ -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

1
demos/sofaboot/run_sofaboot_on_occlum_jdk8.sh
View File

@ -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

1
demos/tensorflow/tensorflow_serving/run_occlum_tf_serving.sh
View File

@ -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

1
demos/tensorflow/tensorflow_training/run_tensorflow_on_occlum.sh
View File

@ -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