Skip to content

Commit 7ec740d

Browse files
committed
Fix minor bugs
1 parent 2678d87 commit 7ec740d

4 files changed

Lines changed: 10 additions & 11 deletions

File tree

experiments/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dim: 30
1+
dim: 10
22
density: 0.2
33
n_processes: 1
4-
plot: true
4+
plot: false

scripts/profiling_memory.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ def compute_eigvals(A, n_procs):
138138
import numpy as np
139139

140140
df = pd.read_csv("logs/memory_profile.csv")
141-
df = df.groupby(["matrix_size", "n_processes"], as_index=False).mean()
142141

143142
nproc_values = sorted(df["n_processes"].unique())
144143

@@ -164,8 +163,8 @@ def compute_eigvals(A, n_procs):
164163
label="SciPy",
165164
)
166165

167-
for i, nproc in enumerate(nproc_values):
168-
subset = df[df["n_processes"] == nproc]
166+
for nproc in nproc_values:
167+
subset = df[df["n_processes"] == nproc].sort_values("matrix_size")
169168
label = f"Divide and Conquer ({nproc} proc{'s' if nproc > 1 else ''})"
170169
plt.plot(
171170
subset["matrix_size"],

shell/submit.sbatch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ module load openmpi3/3.1.4
3232
conda activate devtools_scicomp
3333

3434
# Ranges over which we iterate
35-
n_processes=(1 2)
36-
matrix_sizes=(5 10 20)
35+
n_processes=(1 2 4 8)
36+
matrix_sizes=(10 100 500 1000)
3737

3838
last_dim="${matrix_sizes[-1]}"
3939
last_nproc="${n_processes[-1]}"
@@ -51,7 +51,7 @@ for dim in "${matrix_sizes[@]}"; do
5151
echo "------------------"
5252

5353
sed -i "s/^dim: .*/dim: $dim/" $CONFIG_FILE
54-
sed -i "s/^n_processes: .*/n_processes: $n_processes/" $CONFIG_FILE
54+
sed -i "s/^n_processes: .*/n_processes: $n_p/" $CONFIG_FILE
5555
sed -i "s/^plot: .*/plot: false/" $CONFIG_FILE
5656
echo "Running with size=$dim and n_processes=$n_p"
5757

shell/submit.sh

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

33
# Ranges over which we iterate
4-
n_processes=(1 2)
5-
matrix_sizes=(5 10 20)
4+
n_processes=(1 2 4 8)
5+
matrix_sizes=(10 100 500 1000)
66

77
last_dim="${matrix_sizes[-1]}"
88
last_nproc="${n_processes[-1]}"
@@ -20,7 +20,7 @@ for dim in "${matrix_sizes[@]}"; do
2020
echo "------------------"
2121

2222
sed -i "s/^dim: .*/dim: $dim/" $CONFIG_FILE
23-
sed -i "s/^n_processes: .*/n_processes: $n_processes/" $CONFIG_FILE
23+
sed -i "s/^n_processes: .*/n_processes: $n_p/" $CONFIG_FILE
2424
sed -i "s/^plot: .*/plot: false/" $CONFIG_FILE
2525
echo "Running with size=$dim and n_processes=$n_p"
2626

0 commit comments

Comments
 (0)