wip: support no-eastl

Author: Mike-Leo-Smith

.github/workflows/ci.yml

@@ -7,10 +7,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-24.04, ubuntu-24.04-arm, ubuntu-22.04 ]
+        include:
+          - os: ubuntu-24.04
+            arch: x86_64
+            cuda-keyring: x86_64
+          - os: ubuntu-24.04-arm
+            arch: aarch64
+            cuda-keyring: sbsa
         compiler:
           - { name: gcc, version: 11 }
-          # - { name: gcc, version: 12 }
           - { name: gcc, version: 13 }
           - { name: clang, version: 14 }
           - { name: clang, version: 15 }
@@ -40,23 +45,15 @@ jobs:
           fi
           sudo apt-get update
           sudo apt-get -y install build-essential cmake ninja-build uuid-dev libxinerama-dev libxcursor-dev libxi-dev libvulkan-dev libxkbcommon-dev libxrandr-dev
-      - name: "Download CUDA Keyring (ubuntu-24.04)"
-        if: matrix.os == 'ubuntu-24.04'
+      - name: "Install CUDA Keyring"
         run: |
-          wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64/cuda-keyring_1.1-1_all.deb
-      - name: "Download CUDA Keyring (ubuntu-24.04-arm)"
-        if: matrix.os == 'ubuntu-24.04-arm'
-        run: |
-          wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/sbsa/cuda-keyring_1.1-1_all.deb
-      - name: "Download CUDA Keyring (ubuntu-22.04)"
-        if: matrix.os == 'ubuntu-22.04'
-        run: |
-          wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.1-1_all.deb
+          wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/${{ matrix.cuda-keyring }}/cuda-keyring_1.1-1_all.deb
+          sudo apt-get -y remove --purge -s '*cuda*' '*nvidia*'
+          sudo dpkg -i cuda-keyring_1.1-1_all.deb
       - name: "Setup CUDA"
         run: |
-          sudo dpkg -i cuda-keyring_1.1-1_all.deb
           sudo apt-get update
-          sudo apt-get -y install cuda-12.8
+          sudo apt-get -y install cuda
           sudo apt-get -y clean # save some space
       - name: "Setup Vulkan SDK"
         uses: johnnynunez/setup-vulkan-sdk@v1

src/compute

@@ -17,14 +17,28 @@ namespace luisa::render {
 class SceneDesc;
 class SceneNodeDesc;
 
+struct JustBool {
+    bool value;
+    JustBool(bool value) noexcept : value{value} {}
+    operator bool() const noexcept { return value; }
+};
+
 namespace detail {
 
 template<typename T>
-struct scene_node_raw_property : public scene_node_raw_property<std::remove_cvref<T>> {};
+struct scene_node_raw_property
+    : public scene_node_raw_property<std::remove_cvref<T>> {};
+
+// use JustBool to represent bool to avoid vector<bool> specialization
+template<>
+struct scene_node_raw_property<JustBool> {
+    using type = JustBool;
+    static constexpr luisa::string_view value = "bool";
+};
 
 template<>
 struct scene_node_raw_property<bool> {
-    using type = bool;
+    using type = JustBool;
     static constexpr luisa::string_view value = "bool";
 };
 
@@ -81,7 +95,7 @@ constexpr auto is_property_list_v<luisa::vector<T>> = true;
 class SceneNodeDesc {
 
 public:
-    using bool_type = bool;
+    using bool_type = JustBool;
     using number_type = double;
     using string_type = luisa::string;
     using node_type = const SceneNodeDesc *;
@@ -296,7 +310,7 @@ SceneNodeDesc::_property_raw_values(luisa::string_view name) const noexcept {
             _identifier, source_location().string());
         return luisa::nullopt;
     }
-    return luisa::span{std::as_const(*ptr)};
+    return luisa::span{*std::as_const(ptr)};
 }
 
 template<typename T>

src/sdl/scene_node_desc.h

@@ -99,7 +99,7 @@ void SceneParserJSON::_parse_node(SceneNodeDesc &desc, const json &node) const n
                 for (auto &&v : array) { values.emplace_back(v.get<double>()); }
                 desc.add_property(item.key(), std::move(values));
             } else if (array[0].is_boolean()) {
-                luisa::vector<bool> values;
+                luisa::vector<JustBool> values;
                 values.reserve(array.size());
                 for (auto &&v : array) { values.emplace_back(v.get<bool>()); }
                 desc.add_property(item.key(), std::move(values));

src/sdl/scene_parser_json.cpp

@@ -22,7 +22,7 @@ inline auto builtin_ior_texture_desc(luisa::string name) noexcept {
             desc->define(SceneNodeTag::TEXTURE, "Constant", {});
             desc->add_property("v", SceneNodeDesc::number_list{ior.x, ior.y, ior.z});
             for (auto &c : name) { c = static_cast<char>(tolower(c)); }
-            return eastl::make_pair(std::move(name), std::move(desc));
+            return luisa::make_pair(std::move(name), std::move(desc));
         };
         using namespace std::string_view_literals;
         return luisa::fixed_map<luisa::string, luisa::shared_ptr<SceneNodeDesc>, 15>{

src/surfaces/glass.cpp

@@ -68,7 +68,7 @@ class PolymorphicCall {
         const ClosureCreator &f = [] { return luisa::make_unique<Closure>(); }) noexcept {
 
         auto [iter, first] = _closure_tags.try_emplace(
-            identifier, static_cast<uint>(_closures.size()));
+            luisa::string{identifier}, static_cast<uint>(_closures.size()));
         if (first) { _closures.emplace_back(f()); }
         _tag = iter->second;
         auto closure = dynamic_cast<T *>(_closures[iter->second].get());

src/util/polymorphic_closure.h

@@ -46,7 +46,7 @@ create_alias_table(luisa::span<const float> values) noexcept {
     } else [[likely]] {
         auto inv_sum = 1.0 / sum;
         std::transform(
-            values.cbegin(), values.cend(), pdf.begin(),
+            values.begin(), values.end(), pdf.begin(),
             [inv_sum](auto v) noexcept {
                 return static_cast<float>(std::abs(v) * inv_sum);
             });