From d7231e226aaf279f300a9dfdcfd7c95568d349a5 Mon Sep 17 00:00:00 2001 From: Tom Deakin Date: Mon, 4 Dec 2023 12:48:58 +0000 Subject: [PATCH] Revert "Rename Julia package to `BabelStream.jl` and add compats (#175)" This reverts commit 78ba4ff37a61a57e18887cbc13b743b43739cc76. --- .github/workflows/main.yaml | 2 +- README.md | 2 +- .../.JuliaFormatter.toml | 0 .../{BabelStream.jl => JuliaStream.jl}/.gitignore | 0 .../AMDGPU/Manifest.toml | 0 .../AMDGPU/Project.toml | 0 .../CUDA/Manifest.toml | 0 .../CUDA/Project.toml | 0 .../KernelAbstractions/Manifest.toml | 0 .../KernelAbstractions/Project.toml | 0 .../{BabelStream.jl => JuliaStream.jl}/Manifest.toml | 0 .../{BabelStream.jl => JuliaStream.jl}/Project.toml | 12 +----------- .../{BabelStream.jl => JuliaStream.jl}/README.md | 10 +++++----- .../Threaded/Manifest.toml | 0 .../Threaded/Project.toml | 0 .../oneAPI/Manifest.toml | 0 .../oneAPI/Project.toml | 0 .../src/AMDGPUStream.jl | 0 .../src/CUDAStream.jl | 0 .../src/DistributedStream.jl | 0 .../src/JuliaStream.jl | 4 ++-- .../src/KernelAbstractionsStream.jl | 0 .../src/PlainStream.jl | 0 .../{BabelStream.jl => JuliaStream.jl}/src/Stream.jl | 0 .../src/StreamData.jl | 0 .../src/ThreadedStream.jl | 0 .../src/oneAPIStream.jl | 0 .../{BabelStream.jl => JuliaStream.jl}/update_all.sh | 0 28 files changed, 10 insertions(+), 20 deletions(-) rename src/julia/{BabelStream.jl => JuliaStream.jl}/.JuliaFormatter.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/.gitignore (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/AMDGPU/Manifest.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/AMDGPU/Project.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/CUDA/Manifest.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/CUDA/Project.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/KernelAbstractions/Manifest.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/KernelAbstractions/Project.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/Manifest.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/Project.toml (74%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/README.md (97%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/Threaded/Manifest.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/Threaded/Project.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/oneAPI/Manifest.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/oneAPI/Project.toml (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/src/AMDGPUStream.jl (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/src/CUDAStream.jl (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/src/DistributedStream.jl (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/src/JuliaStream.jl (63%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/src/KernelAbstractionsStream.jl (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/src/PlainStream.jl (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/src/Stream.jl (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/src/StreamData.jl (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/src/ThreadedStream.jl (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/src/oneAPIStream.jl (100%) rename src/julia/{BabelStream.jl => JuliaStream.jl}/update_all.sh (100%) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 7aacedc8..2e542016 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-22.04 defaults: run: - working-directory: ./src/julia/BabelStream.jl + working-directory: ./src/julia/JuliaStream.jl steps: - uses: actions/checkout@v4 - name: Setup project diff --git a/README.md b/README.md index 0e93922a..8f99619c 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ BabelStream is currently implemented in the following parallel programming model - Futhark This project also contains implementations in alternative languages with different build systems: -* Julia - [BabelStream.jl](./src/julia/BabelStream.jl) +* Julia - [JuliaStream.jl](./src/julia/JuliaStream.jl) * Java - [java-stream](./src/java/java-stream) * Scala - [scala-stream](./src/scala/scala-stream) * Rust - [rust-stream](./src/rust/rust-stream) diff --git a/src/julia/BabelStream.jl/.JuliaFormatter.toml b/src/julia/JuliaStream.jl/.JuliaFormatter.toml similarity index 100% rename from src/julia/BabelStream.jl/.JuliaFormatter.toml rename to src/julia/JuliaStream.jl/.JuliaFormatter.toml diff --git a/src/julia/BabelStream.jl/.gitignore b/src/julia/JuliaStream.jl/.gitignore similarity index 100% rename from src/julia/BabelStream.jl/.gitignore rename to src/julia/JuliaStream.jl/.gitignore diff --git a/src/julia/BabelStream.jl/AMDGPU/Manifest.toml b/src/julia/JuliaStream.jl/AMDGPU/Manifest.toml similarity index 100% rename from src/julia/BabelStream.jl/AMDGPU/Manifest.toml rename to src/julia/JuliaStream.jl/AMDGPU/Manifest.toml diff --git a/src/julia/BabelStream.jl/AMDGPU/Project.toml b/src/julia/JuliaStream.jl/AMDGPU/Project.toml similarity index 100% rename from src/julia/BabelStream.jl/AMDGPU/Project.toml rename to src/julia/JuliaStream.jl/AMDGPU/Project.toml diff --git a/src/julia/BabelStream.jl/CUDA/Manifest.toml b/src/julia/JuliaStream.jl/CUDA/Manifest.toml similarity index 100% rename from src/julia/BabelStream.jl/CUDA/Manifest.toml rename to src/julia/JuliaStream.jl/CUDA/Manifest.toml diff --git a/src/julia/BabelStream.jl/CUDA/Project.toml b/src/julia/JuliaStream.jl/CUDA/Project.toml similarity index 100% rename from src/julia/BabelStream.jl/CUDA/Project.toml rename to src/julia/JuliaStream.jl/CUDA/Project.toml diff --git a/src/julia/BabelStream.jl/KernelAbstractions/Manifest.toml b/src/julia/JuliaStream.jl/KernelAbstractions/Manifest.toml similarity index 100% rename from src/julia/BabelStream.jl/KernelAbstractions/Manifest.toml rename to src/julia/JuliaStream.jl/KernelAbstractions/Manifest.toml diff --git a/src/julia/BabelStream.jl/KernelAbstractions/Project.toml b/src/julia/JuliaStream.jl/KernelAbstractions/Project.toml similarity index 100% rename from src/julia/BabelStream.jl/KernelAbstractions/Project.toml rename to src/julia/JuliaStream.jl/KernelAbstractions/Project.toml diff --git a/src/julia/BabelStream.jl/Manifest.toml b/src/julia/JuliaStream.jl/Manifest.toml similarity index 100% rename from src/julia/BabelStream.jl/Manifest.toml rename to src/julia/JuliaStream.jl/Manifest.toml diff --git a/src/julia/BabelStream.jl/Project.toml b/src/julia/JuliaStream.jl/Project.toml similarity index 74% rename from src/julia/BabelStream.jl/Project.toml rename to src/julia/JuliaStream.jl/Project.toml index 303e52e0..76c92024 100644 --- a/src/julia/BabelStream.jl/Project.toml +++ b/src/julia/JuliaStream.jl/Project.toml @@ -1,4 +1,4 @@ -name = "BabelStream" +name = "JuliaStream" uuid = "1bdcc9b7-f5ed-4705-bc7b-be1b748ec681" authors = ["Wei-Chen Lin "] version = "4.0" @@ -16,14 +16,4 @@ ROCKernels = "7eb9e9f0-4bd3-4c4c-8bef-26bd9629d9b9" oneAPI = "8f75cd03-7ff8-4ecb-9b8f-daf728133b1b" [compat] -AMDGPU = "0.4.8" -ArgParse = "1.1.4" -CUDA = "4.0.1" -CUDAKernels = "0.4.7" -Distributed = "1" -ExprTools = "0.1.10" -KernelAbstractions = "0.8.6" -Parameters = "0.12.3" -ROCKernels = "0.3.5" -oneAPI = "1.0.2" julia = "1.9" diff --git a/src/julia/BabelStream.jl/README.md b/src/julia/JuliaStream.jl/README.md similarity index 97% rename from src/julia/BabelStream.jl/README.md rename to src/julia/JuliaStream.jl/README.md index 345d2eb7..6204da7a 100644 --- a/src/julia/BabelStream.jl/README.md +++ b/src/julia/JuliaStream.jl/README.md @@ -1,4 +1,4 @@ -BabelStream.jl +JuliaStream.jl ============== This is an implementation of BabelStream in Julia which contains the following variants: @@ -35,7 +35,7 @@ A set of reduced dependency projects are available for the following backend and With Julia on path, run your selected benchmark with: ```shell -> cd BabelStream.jl +> cd JuliaStream.jl > julia --project= -e 'import Pkg; Pkg.instantiate()' # only required on first run > julia --project= src/Stream.jl ``` @@ -43,7 +43,7 @@ With Julia on path, run your selected benchmark with: For example. to run the CUDA implementation: ```shell -> cd BabelStream.jl +> cd JuliaStream.jl > julia --project=CUDA -e 'import Pkg; Pkg.instantiate()' > julia --project=CUDA src/CUDAStream.jl ``` @@ -61,7 +61,7 @@ There may be instances where some packages are locked to an older version becaus To run the benchmark using the top-level project, run the benchmark with: ```shell -> cd BabelStream.jl +> cd JuliaStream.jl > julia --project -e 'import Pkg; Pkg.instantiate()' > julia --project src/Stream.jl -``` +``` \ No newline at end of file diff --git a/src/julia/BabelStream.jl/Threaded/Manifest.toml b/src/julia/JuliaStream.jl/Threaded/Manifest.toml similarity index 100% rename from src/julia/BabelStream.jl/Threaded/Manifest.toml rename to src/julia/JuliaStream.jl/Threaded/Manifest.toml diff --git a/src/julia/BabelStream.jl/Threaded/Project.toml b/src/julia/JuliaStream.jl/Threaded/Project.toml similarity index 100% rename from src/julia/BabelStream.jl/Threaded/Project.toml rename to src/julia/JuliaStream.jl/Threaded/Project.toml diff --git a/src/julia/BabelStream.jl/oneAPI/Manifest.toml b/src/julia/JuliaStream.jl/oneAPI/Manifest.toml similarity index 100% rename from src/julia/BabelStream.jl/oneAPI/Manifest.toml rename to src/julia/JuliaStream.jl/oneAPI/Manifest.toml diff --git a/src/julia/BabelStream.jl/oneAPI/Project.toml b/src/julia/JuliaStream.jl/oneAPI/Project.toml similarity index 100% rename from src/julia/BabelStream.jl/oneAPI/Project.toml rename to src/julia/JuliaStream.jl/oneAPI/Project.toml diff --git a/src/julia/BabelStream.jl/src/AMDGPUStream.jl b/src/julia/JuliaStream.jl/src/AMDGPUStream.jl similarity index 100% rename from src/julia/BabelStream.jl/src/AMDGPUStream.jl rename to src/julia/JuliaStream.jl/src/AMDGPUStream.jl diff --git a/src/julia/BabelStream.jl/src/CUDAStream.jl b/src/julia/JuliaStream.jl/src/CUDAStream.jl similarity index 100% rename from src/julia/BabelStream.jl/src/CUDAStream.jl rename to src/julia/JuliaStream.jl/src/CUDAStream.jl diff --git a/src/julia/BabelStream.jl/src/DistributedStream.jl b/src/julia/JuliaStream.jl/src/DistributedStream.jl similarity index 100% rename from src/julia/BabelStream.jl/src/DistributedStream.jl rename to src/julia/JuliaStream.jl/src/DistributedStream.jl diff --git a/src/julia/BabelStream.jl/src/JuliaStream.jl b/src/julia/JuliaStream.jl/src/JuliaStream.jl similarity index 63% rename from src/julia/BabelStream.jl/src/JuliaStream.jl rename to src/julia/JuliaStream.jl/src/JuliaStream.jl index 3e5de26d..e01d46de 100644 --- a/src/julia/BabelStream.jl/src/JuliaStream.jl +++ b/src/julia/JuliaStream.jl/src/JuliaStream.jl @@ -1,4 +1,4 @@ -module BabelStream +module JuliaStream end -println("Please run benchmarks directly via `julia --project src/Stream.jl`") +println("Please run benchmarks directly via `julia --project src/Stream.jl`") \ No newline at end of file diff --git a/src/julia/BabelStream.jl/src/KernelAbstractionsStream.jl b/src/julia/JuliaStream.jl/src/KernelAbstractionsStream.jl similarity index 100% rename from src/julia/BabelStream.jl/src/KernelAbstractionsStream.jl rename to src/julia/JuliaStream.jl/src/KernelAbstractionsStream.jl diff --git a/src/julia/BabelStream.jl/src/PlainStream.jl b/src/julia/JuliaStream.jl/src/PlainStream.jl similarity index 100% rename from src/julia/BabelStream.jl/src/PlainStream.jl rename to src/julia/JuliaStream.jl/src/PlainStream.jl diff --git a/src/julia/BabelStream.jl/src/Stream.jl b/src/julia/JuliaStream.jl/src/Stream.jl similarity index 100% rename from src/julia/BabelStream.jl/src/Stream.jl rename to src/julia/JuliaStream.jl/src/Stream.jl diff --git a/src/julia/BabelStream.jl/src/StreamData.jl b/src/julia/JuliaStream.jl/src/StreamData.jl similarity index 100% rename from src/julia/BabelStream.jl/src/StreamData.jl rename to src/julia/JuliaStream.jl/src/StreamData.jl diff --git a/src/julia/BabelStream.jl/src/ThreadedStream.jl b/src/julia/JuliaStream.jl/src/ThreadedStream.jl similarity index 100% rename from src/julia/BabelStream.jl/src/ThreadedStream.jl rename to src/julia/JuliaStream.jl/src/ThreadedStream.jl diff --git a/src/julia/BabelStream.jl/src/oneAPIStream.jl b/src/julia/JuliaStream.jl/src/oneAPIStream.jl similarity index 100% rename from src/julia/BabelStream.jl/src/oneAPIStream.jl rename to src/julia/JuliaStream.jl/src/oneAPIStream.jl diff --git a/src/julia/BabelStream.jl/update_all.sh b/src/julia/JuliaStream.jl/update_all.sh similarity index 100% rename from src/julia/BabelStream.jl/update_all.sh rename to src/julia/JuliaStream.jl/update_all.sh