Remove metal test code #1

jurihock · Jan 2, 2023 · 51042fd · 51042fd
1 parent 8c4cd6f
commit 51042fd
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 310 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -13,10 +13,6 @@ indent_size = 4
 indent_style = space
 indent_size = 2
 
-[*.metal]
-indent_style = space
-indent_size = 2
-
 [*.sh]
 indent_style = space
 indent_size = 2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,6 @@ endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/lib/cpm.cmake")
 
-include("${CMAKE_CURRENT_LIST_DIR}/lib/metal.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/lib/opencl.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/lib/qt.cmake")
 

diff --git a/lib/metal.cmake b/lib/metal.cmake
diff --git a/src/voyx/Voyx.cpp b/src/voyx/Voyx.cpp
@@ -1,12 +1,5 @@
 #include <voyx/Source.h>
 
-#ifdef VOYXMETAL
-#define NS_PRIVATE_IMPLEMENTATION
-#include <Foundation/Foundation.hpp>
-#define MTL_PRIVATE_IMPLEMENTATION
-#include <Metal/Metal.hpp>
-#endif
-
 #include <voyx/io/AudioProbe.h>
 #include <voyx/io/MidiObserver.h>
 #include <voyx/io/MidiProbe.h>
@@ -25,7 +18,6 @@
 
 #include <voyx/dsp/BypassPipeline.h>
 #include <voyx/dsp/InverseSynthPipeline.h>
-#include <voyx/dsp/MetalTestPipeline.h>
 #include <voyx/dsp/OpenclTestPipeline.h>
 #include <voyx/dsp/RobotPipeline.h>
 #include <voyx/dsp/SdftTestPipeline.h>
@@ -186,7 +178,6 @@ int main(int argc, char** argv)
 
   // auto pipe = std::make_shared<BypassPipeline>(source, sink);
   // auto pipe = std::make_shared<InverseSynthPipeline>(samplerate, framesize, hopsize, source, sink, observer, plot);
-  // auto pipe = std::make_shared<MetalTestPipeline>(samplerate, framesize, dftsize, source, sink);
   // auto pipe = std::make_shared<OpenclTestPipeline>(samplerate, framesize, dftsize, source, sink);
   // auto pipe = std::make_shared<RobotPipeline>(samplerate, framesize, dftsize, source, sink, observer, plot);
   auto pipe = std::make_shared<SdftTestPipeline>(samplerate, framesize, dftsize, source, sink, observer, plot);

diff --git a/src/voyx/dsp/MetalTestPipeline.cpp b/src/voyx/dsp/MetalTestPipeline.cpp
diff --git a/src/voyx/dsp/MetalTestPipeline.h b/src/voyx/dsp/MetalTestPipeline.h
diff --git a/src/voyx/metal/Complex.metal b/src/voyx/metal/Complex.metal
diff --git a/src/voyx/metal/SDFT.metal b/src/voyx/metal/SDFT.metal
diff --git a/src/voyx/metal/Voyx.metal b/src/voyx/metal/Voyx.metal
diff --git a/src/voyx/voyx.cmake b/src/voyx/voyx.cmake
@@ -20,7 +20,6 @@ target_link_libraries(voyx
           dr
           easyloggingpp
           fmt
-          metal
           mlinterp
           opencl
           openmp
@@ -62,33 +61,6 @@ if (UI)
 
 endif()
 
-if (METAL)
-
-  target_compile_definitions(voyx
-    PRIVATE VOYXMETAL)
-
-  add_custom_command(
-    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/default.air"
-    COMMAND xcrun -sdk macosx metal -c "${CMAKE_CURRENT_LIST_DIR}/metal/Voyx.metal" -o "${CMAKE_CURRENT_BINARY_DIR}/default.air"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-    DEPENDS "${CMAKE_CURRENT_LIST_DIR}/metal/Voyx.metal")
-
-  add_custom_target(xcrun_default_air
-    ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/default.air")
-
-  add_custom_command(
-    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/default.metallib"
-    COMMAND xcrun -sdk macosx metallib "${CMAKE_CURRENT_BINARY_DIR}/default.air" -o "${CMAKE_CURRENT_BINARY_DIR}/default.metallib"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-    DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/default.air")
-
-  add_custom_target(xcrun_default_metallib
-    ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/default.metallib")
-
-  add_dependencies(xcrun_default_metallib xcrun_default_air)
-
-endif()
-
 if (OPENCL)
 
   target_compile_definitions(voyx