Commit 2cb8639c authored by Pedro Gonnet's avatar Pedro Gonnet
Browse files

minor fixes


Former-commit-id: 93602f77bdf41fc8b0cd7a39d7253cf4c31d29ee
parent 405d95dc
......@@ -22,7 +22,7 @@
CC=gcc
FC=gfortran
OPTS=-DTIMER -DCOUNTER -DCPU_TPS=2.67e9 -DHAVE_ZLIB -DHAVE_SETAFFINITY -D_GNU_SOURCE
OPTS=-DTIMER -DCOUNTER -DCPU_TPS=2.2e9 -DHAVE_ZLIB -DHAVE_SETAFFINITY -D_GNU_SOURCE
CFLAGS=-O3 -g -std=gnu99 -Wall -Werror -march=native -mtune=native -ffast-math -fomit-frame-pointer -malign-double -fstrict-aliasing -fopenmp
# CFLAGS=-O0 -g -std=gnu99 -Wall -Werror -fopenmp
LDFLAGS=-std=gnu99 -lm -lpthread -fopenmp -lz
......
......@@ -831,13 +831,13 @@ void space_maketasks ( struct space *s , int do_sort ) {
if ( c->count > 0 ) {
if ( do_sort ) {
if ( c->count < 500 ) {
if ( c->count < 1000 ) {
sort[0] = space_addtask( s , tid_sort , 0x1fff , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
for ( k = 0 ; k < 13 ; k++ )
c->sorts[k] = sort[0];
nr_sort = 1;
}
else if ( c->count < 2000 ) {
else if ( c->count < 5000 ) {
sort[0] = space_addtask( s , tid_sort , 0xf , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
sort[1] = space_addtask( s , tid_sort , 0xf0 , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
sort[2] = space_addtask( s , tid_sort , 0x1f00 , 0 , c , NULL , sort_up , nr_sort_up , NULL , 0 );
......@@ -882,7 +882,7 @@ void space_maketasks ( struct space *s , int do_sort ) {
maketasks_rec( c->progeny[k] , sort , nr_sort , c );
/* Worth splitting into several tasks? */
if ( !space_dosub || c->count > 1.5*space_splitsize ) {
if ( !space_dosub || c->count > 2*space_splitsize ) {
/* Make a task for eac pair of progeny. */
for ( j = 0 ; j < 8 ; j++ )
......
......@@ -4,21 +4,22 @@
export OMP_WAIT_POLICY=PASSIVE
# Clear up the memory first
# ./memhog `free -g | grep Mem | awk '{print int(0.9*$2)}'`
./memhog `free -g | grep Mem | awk '{print int(0.9*$2)}'`
# loop over number of CPUs
for cpu in {1..32}
for cpu in {16..48}
do
# Set some environment variables for OpenMP
export OMP_NUM_THREADS=$cpu
export OMP_THREAD_LIMIT=$cpu
export OMP_PROC_BIND=TRUE
# export OMP_CPU_AFFINITY="0-47"
# export OMP_PROC_BIND=TRUE
# "large"
# ./test -r 100 -t $cpu -b "100 100 100" -N 3558892 -c snap_C09/Coordinates.txt.gz -s "50 50 50" -p 0 -h snap_C09/SmoothingLength.txt.gz -m 6.138 -z 800 > snap_C09_${cpu}.dump
# "small"
./test -r 1000 -t $cpu -b "1400 1400 1400" -N 74240 -c small/Coordinates.txt.gz -s "700 700 700" -p 0 -h small/SmoothingLength.txt.gz -m 470 -z 400 > small_${cpu}.dump
# ./test -r 100 -t $cpu -q $cpu -b "25000 25000 25000" -N 149646 -c data/Coordinates.txt -s "12500 12500 12500" -h data/SmoothingLength.txt > test_${cpu}.dump
./test -r 100 -t $cpu -q $cpu -b "100 100 100" -N 3664514 -c data2/Coordinates.txt -h data2/SmoothingLength.txt > test2_${cpu}.dump
# ./test -r 100 -t $cpu -q $cpu -b "140 140 140" -N 7741 -c shrink/Coordinates.txt -s "70 70 70" -h shrink/SmoothingLength.txt > shrink_${cpu}.dump
done
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment