Remove SCN

LibRapid · Aug 15, 2023 · 4129610 · 4129610
1 parent b195677
commit 4129610
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -430,14 +430,10 @@ endif ()
 
 # Add dependencies
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/librapid/vendor/fmt")
-# add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/librapid/vendor/Vc")
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/librapid/vendor/xsimd")
-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/librapid/vendor/scnlib")
 
 target_compile_definitions(fmt PUBLIC FMT_HEADER_ONLY)
-# target_compile_definitions(Vc PRIVATE Vc_HACK_OSTREAM_FOR_TTY)
-# target_link_libraries(${module_name} PUBLIC fmt scn Vc xsimd)
-target_link_libraries(${module_name} PUBLIC fmt scn xsimd)
+target_link_libraries(${module_name} PUBLIC fmt xsimd)
 
 if (${LIBRAPID_USE_MULTIPREC})
     # Load MPIR

diff --git a/librapid/include/librapid/core/librapidPch.hpp b/librapid/include/librapid/core/librapidPch.hpp
@@ -57,26 +57,6 @@
 #include <fmt/printf.h>
 #include <fmt/xchar.h>
 
-#if !defined(LIBRAPID_MINGW) // MinGW does not implement std::from_chars which is required by scnlib
-// scnlib
-#    include <scn/scn.h>
-#    include <scn/tuple_return/tuple_return.h>
-#endif // !LIBRAPID_MINGW
-
-// Vc -- SIMD instructions
-#if defined(_MSC_VER)
-// For Vc, we need to disable the following warnings
-#    pragma warning(push)
-#    pragma warning(disable : 4244) // conversion from 'int' to 'float', possible loss of data
-#    pragma warning(disable : 4324) // structure was padded due to alignment specifier
-#    pragma warning(disable : 4127) // conditional expression is constant
-#endif
-
-// #include <Vc/Vc>
-// #include <Vc/algorithm>
-// #include <Vc/cpuid.h>
-// #include <Vc/common/simdize.h>
-
 #include <xsimd/xsimd.hpp>
 
 #if defined(_MSC_VER)

diff --git a/librapid/src/openclConfigure.cpp b/librapid/src/openclConfigure.cpp
@@ -242,7 +242,9 @@ __kernel void testAddition(__global const float *a, __global const float *b, __g
             while (deviceIndex < 0 || deviceIndex >= int64_t(global::openclDevices.size())) {
                 std::string prompt =
                   fmt::format("Select OpenCL device [0-{}]: ", global::openclDevices.size() - 1);
-                scn::prompt(prompt.c_str(), "{}", deviceIndex);
+                fmt::print(prompt);
+                std::cout << std::flush;
+                std::cin >> deviceIndex;
             }
 
             global::openCLDevice = global::openclDevices[deviceIndex];