Merge remote-tracking branch 'origin/master'

# Conflicts: # simba/data_processors/cuda/circular_statistics.py # simba/data_processors/cuda/geometry.py # simba/data_processors/cuda/image.py # simba/mixins/circular_statistics.py
sgoldenlab · Sep 3, 2024 · c057c87 · c057c87
2 parents b4169b3 + 033a6cd
commit c057c87
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/docs/tables/.~lock.direction_two_bps.csv# b/docs/tables/.~lock.direction_two_bps.csv#
@@ -0,0 +1 @@
+,simon,simon-Inspiron-15-3520,31.08.2024 19:05,file:///home/simon/.config/libreoffice/4;
diff --git a/docs/tables/.~lock.is_inside_rectangle.csv# b/docs/tables/.~lock.is_inside_rectangle.csv#
@@ -0,0 +1 @@
+,simon,simon-Inspiron-15-3520,31.08.2024 19:02,file:///home/simon/.config/libreoffice/4;
diff --git a/docs/tables/is_inside_rectangle.csv b/docs/tables/is_inside_rectangle.csv
@@ -1,12 +1,11 @@
-FRAMES (MILLION),CUDA JIT GPU (S),NUMBA CPU TIME (S)
-**2 million**,0.005,0.022
-**4 million**,0.009,0.031
-**8 million**,0.016,0.097
-**16 million**,0.028,0.199
-**32 million**,0.054,0.399
-**64 million**,0.111,0.769
-**128 million**,0.33,1.3
-**256 million**,0.666,2.531
-**512 million**,1.161,7.273
-**1 billion**,3.828,13.342
-NVIDIA GeForce RTX 4070,,
+FRAMES (MILLIONS),CUDA JIT GPU (S),NUMBA CPU TIME (S)
+2,0.005,0.022
+4,0.009,0.031
+8,0.016,0.097
+16,0.028,0.199
+32,0.054,0.399
+64,0.111,0.769
+128,0.33,1.300
+256,0.666,2.531
+512,1.161,7.273
+1000,3.828,13.342
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		,simon,simon-Inspiron-15-3520,31.08.2024 19:05,file:///home/simon/.config/libreoffice/4;