Skip to content

Commit 1bbd623

Browse files
fjconejerofjconejero
committed
Merge branch '1-sc-tests-failure' into 'master'
Resolve "SC tests failure" Closes #1 See merge request wdc/bar/apps!5
2 parents 8e2429b + 9294e50 commit 1bbd623

File tree

76 files changed

+365
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+365
-271
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The datasets for the applications can be downloaded using the following link:
1313

1414
## Application's Folder Structure
1515

16-
Application are grouped by language.
16+
Application are grouped by language.
1717
For instance, the matmul application that has version for PyCOMPSs, COMPSs with files,
1818
COMPSs using objects and COMPSs with byte arrays and has the following tree directory.
1919

@@ -34,7 +34,7 @@ apps
3434
| | | ...
3535
|- c
3636
| |- ...
37-
|- datasets Small datasets for examples
37+
|- datasets Small datasets for examples
3838
3939
```
4040

‎c/cholesky/enqueue.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
enqueue_compss -t --lang=c --persistent_worker_c=true --qos=bsc_cs --cpus_per_node=48 --worker_in_master_cpus=0 --num_nodes=2 --worker_working_dir=/gpfs/scratch/bsc19/bsc19007 --exec_time=120 --output_profile=$(pwd)/cholesky.profile --appdir=$(pwd) $(pwd)/master/cholesky $1 $2
1+
enqueue_compss -t --lang=c --persistent_worker_c=true --qos=bsc_cs --project_name=bsc19 --cpus_per_node=48 --worker_in_master_cpus=0 --num_nodes=2 --worker_working_dir=/gpfs/scratch/bsc19/bsc19007 --exec_time=120 --output_profile=$(pwd)/cholesky.profile --appdir=$(pwd) $(pwd)/master/cholesky $1 $2
22

33

‎c/increment/deploy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash -e
2-
2+
33
# Obtain parameter
44
source_base_dir=$1
55
target_base_dir=$2
6-
6+
77
# Copy files
88
cp "${source_base_dir}"/execution "${target_base_dir}"/execution
99
cp "${source_base_dir}"/result "${target_base_dir}"/result

‎c/increment/execution‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
compss_module=$6
1010
queue=$7
1111
qos=$8
12+
project_name=$9
1213
#Execution_envs should be the last parameter because it is a list
13-
execution_envs=$9
14+
execution_envs=${10}
1415
if [ "$queue" != 'none' ]; then
15-
runcompss_opts="${runcompss_opts} --queue=${queue}"
16+
runcompss_opts="${runcompss_opts} --queue=${queue}"
1617
fi
1718
if [ "$qos" != 'none' ]; then
18-
runcompss_opts="${runcompss_opts} --qos=${qos}"
19+
runcompss_opts="${runcompss_opts} --qos=${qos}"
20+
fi
21+
if [ "$project_name" != 'none' ]; then
22+
runcompss_opts="${runcompss_opts} --project_name=${project_name}"
1923
fi
2024

2125
# Global variables
@@ -25,7 +29,7 @@
2529
# Load COMPSs module + application modules
2630

2731
module load ${compss_module}
28-
module load boost/1.75.0
32+
module load boost/1.75.0
2933

3034
#----------------------------------------------------------------------------------
3135
# Compiling C app

‎c/kmeans/queue_all.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
enqueue_compss -t --jvm_workers_opts="-Dcompss.worker.removeWD=false" \
4-
--output_profile=out.prof --persistent_worker_c=true --queue=debug --lang=c \
4+
--output_profile=out.prof --persistent_worker_c=true --queue=bsc_debug --project_name=bsc19 --lang=c \
55
--exec_time=30 --num_nodes=2 --cpus_per_node=16 --gpus_per_node=4 \
66
--worker_in_master_cpus=0 --worker_working_dir=$PWD \
77
master/kmeans -i /gpfs/projects/bsc19/COMPSs_APPS/c/K-means/generator/N200000_K50_d50_0.txt -n 200000 -f 30 -l 4 -k 50 -d 50 -c 24 -o

‎c/kmeans/queue_cpu.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
enqueue_compss --qos=bsc_cs --persistent_worker_c=true --lang=c \
4-
--cpus_per_task --exec_time=120 --num_nodes=1 --cpus_per_node=160 \
5-
--worker_in_master_cpus=160 --worker_working_dir=/gpfs/scratch/bsc19/bsc19007/ \
6-
master/kmeans -i /gpfs/projects/bsc19/COMPSs_APPS/c/K-means/generator/N200000_K50_d50_0.txt -n 200000 -f 8 -l 2 -k 50 -d 50 -o
7-
3+
enqueue_compss --qos=bsc_cs --persistent_worker_c=true --lang=c --project_name=bsc19 \
4+
--cpus_per_task --exec_time=120 --num_nodes=1 --cpus_per_node=160 \
5+
--worker_in_master_cpus=160 --worker_working_dir=/gpfs/scratch/bsc19/bsc19007/ \
6+
master/kmeans -i /gpfs/projects/bsc19/COMPSs_APPS/c/K-means/generator/N200000_K50_d50_0.txt -n 200000 -f 8 -l 2 -k 50 -d 50 -o
7+

‎c/kmeans/queue_gpu.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
enqueue_compss --qos=bsc_cs --persistent_worker_c=true --lang=c \
4-
--cpus_per_task --exec_time=120 --num_nodes=1 --cpus_per_node=160 --gpus_per_node=4 \
5-
--worker_in_master_cpus=160 --worker_working_dir=/gpfs/scratch/bsc19/bsc19007/ \
6-
master/kmeans -i /gpfs/projects/bsc19/COMPSs_APPS/c/K-means/generator/N200000_K50_d50_0.txt -n 200000 -f 8 -l 2 -k 50 -d 50 -o
7-
3+
enqueue_compss --qos=bsc_cs --persistent_worker_c=true --lang=c --project_name=bsc19 \
4+
--cpus_per_task --exec_time=120 --num_nodes=1 --cpus_per_node=160 --gpus_per_node=4 \
5+
--worker_in_master_cpus=160 --worker_working_dir=/gpfs/scratch/bsc19/bsc19007/ \
6+
master/kmeans -i /gpfs/projects/bsc19/COMPSs_APPS/c/K-means/generator/N200000_K50_d50_0.txt -n 200000 -f 8 -l 2 -k 50 -d 50 -o
7+

‎c/matmul/execution‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
compss_module=$6
1010
queue=$7
1111
qos=$8
12+
project_name=$9
1213
#Execution_envs should be the last parameter because it is a list
13-
execution_envs=$9
14+
execution_envs=${10}
1415
if [ "$queue" != 'none' ]; then
15-
runcompss_opts="${runcompss_opts} --queue=${queue}"
16+
runcompss_opts="${runcompss_opts} --queue=${queue}"
1617
fi
1718
if [ "$qos" != 'none' ]; then
18-
runcompss_opts="${runcompss_opts} --qos=${qos}"
19+
runcompss_opts="${runcompss_opts} --qos=${qos}"
20+
fi
21+
if [ "$project_name" != 'none' ]; then
22+
runcompss_opts="${runcompss_opts} --project_name=${project_name}"
1923
fi
2024

2125
# Global variables

‎c/saxpy/deploy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash -e
2-
2+
33
# Obtain parameter
44
source_base_dir=$1
55
target_base_dir=$2
6-
6+
77
# Copy files
88
cp "${source_base_dir}"/execution "${target_base_dir}"/execution
99
cp "${source_base_dir}"/result "${target_base_dir}"/result

‎c/saxpy/execution‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
compss_module=$6
1010
queue=$7
1111
qos=$8
12+
project_name=$9
1213
#Execution_envs should be the last parameter because it is a list
13-
execution_envs=$9
14+
execution_envs=${10}
1415
if [ "$queue" != 'none' ]; then
15-
runcompss_opts="${runcompss_opts} --queue=${queue}"
16+
runcompss_opts="${runcompss_opts} --queue=${queue}"
1617
fi
1718
if [ "$qos" != 'none' ]; then
18-
runcompss_opts="${runcompss_opts} --qos=${qos}"
19+
runcompss_opts="${runcompss_opts} --qos=${qos}"
20+
fi
21+
if [ "$project_name" != 'none' ]; then
22+
runcompss_opts="${runcompss_opts} --project_name=${project_name}"
1923
fi
2024

2125
# Global variables

0 commit comments

Comments
 (0)