Debug New Motion

.buildkite/pipeline.yml

@@ -1,30 +1,39 @@
 steps:
-  - label: ":pipeline: Launch Tests"
+  # - label: ":pipeline: Upload NoMotion Tests"
+  #   env:
+  #     TEST_GROUP: "nomotion"
+  #   command: buildkite-agent pipeline upload .buildkite/runtests.yml
+  #   agents:
+  #     queue: "juliagpu"
+
+  - label: ":pipeline: Upload Motion Tests"
+    env:
+      TEST_GROUP: "motion"
     command: buildkite-agent pipeline upload .buildkite/runtests.yml
     agents:
       queue: "juliagpu"
 
-  - label: ":pipeline: Launch Benchmarks"
-    if: build.message !~ /skip benchmarks/
-    agents:
-      queue: "juliagpu"
-    plugins:
-      - monorepo-diff#v1.0.1:
-          diff: "git diff --name-only HEAD~1"
-          interpolation: false
-          watch:
-            - path:
-                - "KomaMRICore/src/**/*"
-                - "KomaMRICore/ext/**/*"
-                - "KomaMRICore/Project.toml"
-                - "KomaMRIBase/src/**/*"
-                - "KomaMRIBase/Project.toml"
-                - "benchmarks/**/*"
-                - ".buildkite/**/*"
-                - ".github/workflows/Benchmark.yml"
-                - "Project.toml"
-              config:
-                command: "buildkite-agent pipeline upload .buildkite/runbenchmarks.yml"
-                agents:
-                  queue: "juliagpu"
+  # - label: ":pipeline: Launch Benchmarks"
+  #   if: build.message !~ /skip benchmarks/
+  #   agents:
+  #     queue: "juliagpu"
+  #   plugins:
+  #     - monorepo-diff#v1.0.1:
+  #         diff: "git diff --name-only HEAD~1"
+  #         interpolation: false
+  #         watch:
+  #           - path:
+  #               - "KomaMRICore/src/**/*"
+  #               - "KomaMRICore/ext/**/*"
+  #               - "KomaMRICore/Project.toml"
+  #               - "KomaMRIBase/src/**/*"
+  #               - "KomaMRIBase/Project.toml"
+  #               - "benchmarks/**/*"
+  #               - ".buildkite/**/*"
+  #               - ".github/workflows/Benchmark.yml"
+  #               - "Project.toml"
+  #             config:
+  #               command: "buildkite-agent pipeline upload .buildkite/runbenchmarks.yml"
+  #               agents:
+  #                 queue: "juliagpu"
 

.buildkite/runtests.yml

@@ -1,138 +1,146 @@
 steps:
-  - group: ":julia: Tests"
+  - group: ":julia: ($TEST_GROUP) Tests"
     steps:
-      - label: "CPU: Run tests on v{{matrix.version}}"
-        matrix:
-          setup:
-            version:
-              - "1.9"
-              - "1"
-        plugins:
-          - JuliaCI/julia#v1:
-              version: "{{matrix.version}}"
-          - JuliaCI/julia-coverage#v1:
-              codecov: true
-              dirs:
-                - KomaMRICore/src
-                - KomaMRICore/ext
-        command: |
-          julia -e 'println("--- :julia: Instantiating project")
-              using Pkg
-              Pkg.develop([
-                  PackageSpec(path=pwd(), subdir="KomaMRIBase"),
-                  PackageSpec(path=pwd(), subdir="KomaMRICore"),
-              ])'
+      # - label: "CPU: Run tests on v{{matrix.version}}"
+      #   matrix:
+      #     setup:
+      #       version:
+      #         - "1.9"
+      #         - "1"
+      #   plugins:
+      #     - JuliaCI/julia#v1:
+      #         version: "{{matrix.version}}"
+      #     - JuliaCI/julia-coverage#v1:
+      #         codecov: true
+      #         dirs:
+      #           - KomaMRICore/src
+      #           - KomaMRICore/ext
+      #   env:
+      #     TEST_GROUP: $TEST_GROUP
+      #   command: |
+      #     julia -e 'println("--- :julia: Instantiating project")
+      #         using Pkg
+      #         Pkg.develop([
+      #             PackageSpec(path=pwd(), subdir="KomaMRIBase"),
+      #             PackageSpec(path=pwd(), subdir="KomaMRICore"),
+      #         ])'
 
-          julia -e 'println("--- :julia: Running tests")
-              using Pkg
-              Pkg.test("KomaMRICore"; coverage=true, julia_args=`--threads=auto`)'
-        agents:
-          queue: "juliagpu"
-        timeout_in_minutes: 60
+      #     julia -e 'println("--- :julia: Running tests")
+      #         using Pkg
+      #         Pkg.test("KomaMRICore"; coverage=true, julia_args=`--threads=auto`)'
+      #   agents:
+      #     queue: "juliagpu"
+      #   timeout_in_minutes: 60
 
-      - label: "AMDGPU: Run tests on v{{matrix.version}}"
-        matrix:
-          setup:
-            version:
-              - "1"
-        plugins:
-          - JuliaCI/julia#v1:
-              version: "{{matrix.version}}"
-          - JuliaCI/julia-coverage#v1:
-              codecov: true
-              dirs:
-                - KomaMRICore/src
-                - KomaMRICore/ext
-        command: |
-          julia -e 'println("--- :julia: Instantiating project")
-              using Pkg
-              Pkg.develop([
-                  PackageSpec(path=pwd(), subdir="KomaMRIBase"),
-                  PackageSpec(path=pwd(), subdir="KomaMRICore"),
-              ])'
+      # - label: "AMDGPU: Run tests on v{{matrix.version}}"
+      #   matrix:
+      #     setup:
+      #       version:
+      #         - "1"
+      #   plugins:
+      #     - JuliaCI/julia#v1:
+      #         version: "{{matrix.version}}"
+      #     - JuliaCI/julia-coverage#v1:
+      #         codecov: true
+      #         dirs:
+      #           - KomaMRICore/src
+      #           - KomaMRICore/ext
+      #   env:
+      #     TEST_GROUP: $TEST_GROUP
+      #   command: |
+      #     julia -e 'println("--- :julia: Instantiating project")
+      #         using Pkg
+      #         Pkg.develop([
+      #             PackageSpec(path=pwd(), subdir="KomaMRIBase"),
+      #             PackageSpec(path=pwd(), subdir="KomaMRICore"),
+      #         ])'
 
-          julia --project=KomaMRICore/test -e 'println("--- :julia: Add AMDGPU to test environment")
-              using Pkg
-              Pkg.add("AMDGPU")'
+      #     julia --project=KomaMRICore/test -e 'println("--- :julia: Add AMDGPU to test environment")
+      #         using Pkg
+      #         Pkg.add("AMDGPU")'
 
-          julia -e 'println("--- :julia: Running tests")
-              using Pkg
-              Pkg.test("KomaMRICore"; coverage=true, test_args=["AMDGPU"])'
-        agents:
-          queue: "juliagpu"
-          rocm: "*"
-        timeout_in_minutes: 60
+      #     julia -e 'println("--- :julia: Running tests")
+      #         using Pkg
+      #         Pkg.test("KomaMRICore"; coverage=true, test_args=["AMDGPU", ])'
+      #   agents:
+      #     queue: "juliagpu"
+      #     rocm: "*"
+      #   timeout_in_minutes: 60
 
-      - label: "CUDA: Run tests on v{{matrix.version}}"
-        matrix:
-          setup:
-            version:
-              - "1.9"
-              - "1"
-        plugins:
-          - JuliaCI/julia#v1:
-              version: "{{matrix.version}}"
-          - JuliaCI/julia-coverage#v1:
-              codecov: true
-              dirs:
-                - KomaMRICore/src
-                - KomaMRICore/ext
-        command: |
-          julia -e 'println("--- :julia: Instantiating project")
-              using Pkg
-              Pkg.develop([
-                  PackageSpec(path=pwd(), subdir="KomaMRIBase"),
-                  PackageSpec(path=pwd(), subdir="KomaMRICore"),
-              ])'
+      # - label: "CUDA: Run tests on v{{matrix.version}}"
+      #   matrix:
+      #     setup:
+      #       version:
+      #         - "1.9"
+      #         - "1"
+      #   plugins:
+      #     - JuliaCI/julia#v1:
+      #         version: "{{matrix.version}}"
+      #     - JuliaCI/julia-coverage#v1:
+      #         codecov: true
+      #         dirs:
+      #           - KomaMRICore/src
+      #           - KomaMRICore/ext
+      #   env:
+      #     TEST_GROUP: $TEST_GROUP
+      #   command: |
+      #     julia -e 'println("--- :julia: Instantiating project")
+      #         using Pkg
+      #         Pkg.develop([
+      #             PackageSpec(path=pwd(), subdir="KomaMRIBase"),
+      #             PackageSpec(path=pwd(), subdir="KomaMRICore"),
+      #         ])'
 
-          julia --project=KomaMRICore/test -e 'println("--- :julia: Add CUDA to test environment")
-              using Pkg
-              Pkg.add("CUDA")'
+      #     julia --project=KomaMRICore/test -e 'println("--- :julia: Add CUDA to test environment")
+      #         using Pkg
+      #         Pkg.add("CUDA")'
 
-          julia -e 'println("--- :julia: Running tests")
-              using Pkg
-              Pkg.test("KomaMRICore"; coverage=true, test_args=["CUDA"])'
-        agents:
-          queue: "juliagpu"
-          cuda: "*"
-        timeout_in_minutes: 60
+      #     julia -e 'println("--- :julia: Running tests")
+      #         using Pkg
+      #         Pkg.test("KomaMRICore"; coverage=true, test_args=["CUDA"])'
+      #   agents:
+      #     queue: "juliagpu"
+      #     cuda: "*"
+      #   timeout_in_minutes: 60
 
-      - label: "Metal: Run tests on v{{matrix.version}}"
-        matrix:
-          setup:
-            version:
-              - "1.9"
-              - "1"
-        plugins:
-          - JuliaCI/julia#v1:
-              version: "{{matrix.version}}"
-        command: |
-          julia -e 'println("--- :julia: Instantiating project")
-              using Pkg
-              Pkg.develop([
-                  PackageSpec(path=pwd(), subdir="KomaMRIBase"),
-                  PackageSpec(path=pwd(), subdir="KomaMRICore"),
-              ])'
+      # - label: "Metal: Run tests on v{{matrix.version}}"
+      #   matrix:
+      #     setup:
+      #       version:
+      #         - "1.9"
+      #         - "1"
+      #   plugins:
+      #     - JuliaCI/julia#v1:
+      #         version: "{{matrix.version}}"
+      #   env:
+      #     TEST_GROUP: $TEST_GROUP
+      #   command: |
+      #     julia -e 'println("--- :julia: Instantiating project")
+      #         using Pkg
+      #         Pkg.develop([
+      #             PackageSpec(path=pwd(), subdir="KomaMRIBase"),
+      #             PackageSpec(path=pwd(), subdir="KomaMRICore"),
+      #         ])'
 
-          julia --project=KomaMRICore/test -e 'println("--- :julia: Add Metal to test environment")
-              using Pkg
-              Pkg.add("Metal")'
+      #     julia --project=KomaMRICore/test -e 'println("--- :julia: Add Metal to test environment")
+      #         using Pkg
+      #         Pkg.add("Metal")'
 
-          julia -e 'println("--- :julia: Running tests")
-              using Pkg
-              Pkg.test("KomaMRICore"; test_args=["Metal"])'
-        agents:
-          queue: "juliaecosystem"
-          os: "macos"
-          arch: "aarch64"
-        timeout_in_minutes: 60
+      #     julia -e 'println("--- :julia: Running tests")
+      #         using Pkg
+      #         Pkg.test("KomaMRICore"; test_args=["Metal"])'
+      #   agents:
+      #     queue: "juliaecosystem"
+      #     os: "macos"
+      #     arch: "aarch64"
+      #   timeout_in_minutes: 60
 
       - label: "oneAPI: Run tests on v{{matrix.version}}"
         matrix:
           setup:
             version:
               - "1.9"
-              - "1"
+              # - "1"
         plugins:
           - JuliaCI/julia#v1:
               version: "{{matrix.version}}"
@@ -141,6 +149,8 @@ steps:
               dirs:
                 - KomaMRICore/src
                 - KomaMRICore/ext
+        env:
+          TEST_GROUP: $TEST_GROUP
         command: |
           julia -e 'println("--- :julia: Instantiating project")
               using Pkg
@@ -159,7 +169,7 @@ steps:
         agents:
           queue: "juliagpu"
           intel: "*"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 30
 
 env:
   CI: BUILDKITE

KomaMRIBase/src/KomaMRIBase.jl

@@ -25,13 +25,14 @@ include("datatypes/sequence/ADC.jl")
 include("timing/KeyValuesCalculation.jl")
 include("datatypes/Sequence.jl")
 include("datatypes/sequence/Delay.jl")
+# Motion
+include("motion/MotionSet.jl")
 # Phantom
 include("datatypes/Phantom.jl")
 # Simulator
 include("datatypes/simulation/DiscreteSequence.jl")
 include("timing/TimeStepCalculation.jl")
 include("timing/TrapezoidalIntegration.jl")
-include("timing/UnitTime.jl")
 
 # Main
 export γ    # gyro-magnetic ratio [Hz/T]
@@ -47,12 +48,13 @@ export kfoldperm, trapz, cumtrapz
 # Phantom
 export brain_phantom2D, brain_phantom3D, pelvis_phantom2D, heart_phantom
 # Motion
-export MotionModel
-export NoMotion, SimpleMotion, ArbitraryMotion
-export SimpleMotionType
-export Translation, Rotation, HeartBeat
-export PeriodicTranslation, PeriodicRotation, PeriodicHeartBeat
-export get_spin_coords
+export MotionList, NoMotion, Motion
+export Translate, TranslateX, TranslateY, TranslateZ
+export Rotate, RotateX, RotateY, RotateZ 
+export HeartBeat, Path, FlowPath
+export TimeRange, Periodic
+export SpinRange, AllSpins
+export sort_motions!, get_spin_coords
 # Secondary
 export get_kspace, rotx, roty, rotz
 # Additionals