From 2193cd701de52cc5b6d8444b27f1a611773c4a72 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Wed, 20 Jan 2021 13:27:12 -0500 Subject: [PATCH 1/2] Add a missing space --- Project.toml | 2 +- src/Octavian.jl | 6 +++++- src/init.jl | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index b3f9cb1..4d65875 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Octavian" uuid = "6fd5a793-0b7e-452c-907f-f8bfe9c57db4" authors = ["Mason Protter", "Chris Elrod", "Dilum Aluthge", "contributors"] -version = "0.2.1" +version = "0.2.2" [deps] ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" diff --git a/src/Octavian.jl b/src/Octavian.jl index 0196b36..189cd63 100644 --- a/src/Octavian.jl +++ b/src/Octavian.jl @@ -16,7 +16,11 @@ using ThreadingUtilities: SPIN, WAIT, TASK, LOCK, STUP, taskpointer, wake_thread!, __wait, load, store! -export matmul!, matmul_serial!, matmul, matmul_serial, StaticInt +export StaticInt +export matmul! +export matmul_serial! +export matmul +export matmul_serial include("global_constants.jl") include("types.jl") diff --git a/src/init.jl b/src/init.jl index f7172c0..31f8e08 100644 --- a/src/init.jl +++ b/src/init.jl @@ -5,9 +5,8 @@ function __init__() if nt < NUM_CORES && ("SUPPRESS_OCTAVIAN_WARNING" ∉ keys(ENV)) msg = string( "Your system has $NUM_CORES physical cores, but `Octavian.jl` only has ", - "$(nt > 1 ? "$(nt) threads" : "1 thread") available.", + "$(nt > 1 ? "$(nt) threads" : "$(nt) thread") available. ", "For the best performance, you should start Julia with at least $(NUM_CORES) threads.", - "", ) @warn msg end From 4ec116ee7adb61a65087c8992cee2ac42a1482c8 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Wed, 20 Jan 2021 13:56:36 -0500 Subject: [PATCH 2/2] Update Octavian.jl --- src/Octavian.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Octavian.jl b/src/Octavian.jl index 189cd63..408e39a 100644 --- a/src/Octavian.jl +++ b/src/Octavian.jl @@ -18,8 +18,8 @@ using ThreadingUtilities: export StaticInt export matmul! -export matmul_serial! export matmul +export matmul_serial! export matmul_serial include("global_constants.jl")