refacter DeviceType

Author: ichinii

Intern/rayx-core/src/Shader/LightSources/EnergyDistributions/EnergyDistribution.h

@@ -16,13 +16,14 @@ struct EnergyDistributionList {
 };
 
 struct EnergyDistributionDataBase {
-    using HardEdge        = rayx::HardEdge;
-    using SoftEdge        = rayx::SoftEdge;
-    using SeparateEnergies = rayx::SeparateEnergies;
+    using HardEdge               = rayx::HardEdge;
+    using SoftEdge               = rayx::SoftEdge;
+    using SeparateEnergies       = rayx::SeparateEnergies;
     using EnergyDistributionList = rayx::EnergyDistributionList;
 };
 
-using EnergyDistributionDataVariant = Variant<EnergyDistributionDataBase, EnergyDistributionDataBase::HardEdge, EnergyDistributionDataBase::SoftEdge, SeparateEnergies, EnergyDistributionDataBase::EnergyDistributionList>;
+using EnergyDistributionDataVariant = Variant<EnergyDistributionDataBase, EnergyDistributionDataBase::HardEdge, EnergyDistributionDataBase::SoftEdge,
+                                              SeparateEnergies, EnergyDistributionDataBase::EnergyDistributionList>;
 
 RAYX_FN_ACC double selectEnergy(const HardEdge& __restrict hardEdge, Rand& __restrict rand);
 RAYX_FN_ACC double selectEnergy(const SoftEdge& __restrict softEdge, Rand& __restrict rand);

Intern/rayx-core/src/Tracer/DeviceConfig.cpp

@@ -20,7 +20,11 @@ DeviceType platformToDeviceType();
 
 template <>
 DeviceType platformToDeviceType<alpaka::PlatformCpu>() {
-    return DeviceType::Cpu;
+#if defined(RAYX_OPENMP_ENABLED)
+    return DeviceType::CpuParallel;
+#else
+    return DeviceType::CpuSerial;
+#endif
 }
 
 #if defined(RAYX_CUDA_ENABLED)
@@ -30,13 +34,6 @@ DeviceType platformToDeviceType<alpaka::PlatformCudaRt>() {
 }
 #endif
 
-#if defined(RAYX_HIP_ENABLED)
-template <>
-DeviceType platformToDeviceType<alpaka::PlatformHipRt>() {
-    return DeviceType::GpuHip;
-}
-#endif
-
 template <typename AccTag>
 std::vector<Device> getAvailableDevicesProps() {
     std::vector<Device> devices;
@@ -80,31 +77,26 @@ std::vector<Device> getAvailableDevices(DeviceType deviceType = DeviceType::All)
     };
 
 #if defined(RAYX_OPENMP_ENABLED)
-    using TagCpu = alpaka::TagCpuOmp2Blocks;
+    if (deviceType & DeviceType::CpuParallel) append(alpaka::TagCpuOmp2Blocks{});
 #else
-    using TagCpu = alpaka::TagCpuSerial;
+    if (deviceType & DeviceType::CpuSerial) append(alpaka::TagCpuSerial{});
 #endif
-    if (deviceType & DeviceType::Cpu) append(TagCpu{});
 
 #if defined(RAYX_CUDA_ENABLED)
     if (deviceType & DeviceType::GpuCuda) append(alpaka::TagGpuCudaRt{});
 #endif
 
-#if defined(RAYX_HIP_ENABLED)
-    if (deviceType & DeviceType::GpuHip) append(alpaka::TagGpuHipRt{});
-#endif
-
     return devices;
 }
 
 std::string deviceTypeToString(DeviceType deviceType) {
     std::vector<const char*> names;
 
-    if (deviceType & DeviceType::Cpu) names.push_back("Cpu");
+    if (deviceType & DeviceType::CpuSerial) names.push_back("CpuSerial");
+    if (deviceType & DeviceType::CpuParallel) names.push_back("CpuParallel");
     if (deviceType & DeviceType::GpuCuda) names.push_back("GpuCuda");
-    if (deviceType & DeviceType::GpuHip) names.push_back("GpuHip");
 
-    if (names.empty()) names.push_back("Unsupported");
+    if (names.empty()) names.push_back("None");
 
     std::stringstream ss;
 
@@ -131,9 +123,8 @@ void DeviceConfig::dumpDevices() const {
         RAYX_LOG << "Device - index: " << i << ", type: " << deviceTypeToString(device.type) << ", name: " << device.name;
     }
 
-#if !defined(RAYX_CUDA_ENABLED) && !defined(RAYX_HIP_ENABLED)
-    if (m_fetchedDeviceType != DeviceType::Cpu)
-        RAYX_WARN << "No GPU support was compiled in this build.";
+#if !defined(RAYX_CUDA_ENABLED)
+    if (!(m_fetchedDeviceType & DeviceType::Cpu)) RAYX_WARN << "GPU support is not enabled in this build.";
 #endif
 }
 
@@ -197,4 +188,20 @@ DeviceConfig& DeviceConfig::enableBestDevice(DeviceType deviceType) {
     return *this;
 }
 
+DeviceConfig::DeviceType DeviceConfig::availableDeviceTypes() {
+    DeviceType deviceType = DeviceType::None;
+
+#if defined(RAYX_OPENMP_ENABLED)
+    deviceType = static_cast<DeviceType>(deviceType | DeviceType::CpuParallel);
+#else
+    deviceType = static_cast<DeviceType>(deviceType | DeviceType::CpuSerial);
+#endif
+
+#if defined(RAYX_CUDA_ENABLED)
+    deviceType = static_cast<DeviceType>(deviceType | DeviceType::GpuCuda);
+#endif
+
+    return deviceType;
+}
+
 }  // namespace rayx

Intern/rayx-core/src/Tracer/DeviceConfig.h

@@ -9,11 +9,12 @@ namespace rayx {
 
 struct RAYX_API DeviceConfig {
     enum RAYX_API DeviceType {
-        Unsupported = 0,
-        Cpu         = 1 << 0,
-        GpuCuda     = 1 << 1,
-        GpuHip      = 1 << 2,
-        Gpu         = GpuCuda | GpuHip,
+        None        = 0,
+        CpuSerial   = 1 << 0,
+        CpuParallel = 1 << 1,
+        Cpu         = CpuSerial | CpuParallel,
+        GpuCuda     = 1 << 2,
+        Gpu         = GpuCuda,
         All         = Cpu | Gpu,
     };
 
@@ -46,6 +47,8 @@ struct RAYX_API DeviceConfig {
 
     DeviceConfig& enableBestDevice(DeviceType deviceType = DeviceType::All);
 
+    static DeviceType availableDeviceTypes();
+
     std::vector<Device> devices;
 
   private:

Intern/rayx-core/src/Tracer/Tracer.cpp

@@ -17,13 +17,6 @@ inline std::shared_ptr<rayx::DeviceTracer> createDeviceTracer(DeviceType deviceT
 #else
             RAYX_EXIT << "Failed to create Tracer with Cuda device. Cuda was disabled during build.";
             return nullptr;
-#endif
-        case DeviceType::GpuHip:
-#if defined(RAYX_HIP_ENABLED)
-            eturn std::make_shared<rayx::MegaKernelTracer<alpaka::TagGpuHipRt>>(deviceIndex);
-#else
-            RAYX_EXIT << "Failed to create Tracer with Hip device. Hip was disabled during build.";
-            return nullptr;
 #endif
         default:  // case DeviceType::Cpu
 #if defined(RAYX_OPENMP_ENABLED)