diff --git a/taichi/codegen/codegen_llvm.cpp b/taichi/codegen/codegen_llvm.cpp index 104e95966e954..4b1d6ab2ca8f4 100644 --- a/taichi/codegen/codegen_llvm.cpp +++ b/taichi/codegen/codegen_llvm.cpp @@ -12,7 +12,7 @@ #include "taichi/llvm/launch_arg_info.h" #include "taichi/llvm/llvm_offline_cache.h" #include "taichi/llvm/llvm_program.h" -#include "taichi/struct/struct_llvm.h" +#include "taichi/llvm/struct_llvm.h" #include "taichi/util/file_sequence_writer.h" TLANG_NAMESPACE_BEGIN diff --git a/taichi/codegen/codegen_llvm_quant.cpp b/taichi/codegen/codegen_llvm_quant.cpp index c92a0720c5ec8..083f6242f6dad 100644 --- a/taichi/codegen/codegen_llvm_quant.cpp +++ b/taichi/codegen/codegen_llvm_quant.cpp @@ -2,7 +2,7 @@ #include "taichi/codegen/codegen_llvm.h" #include "taichi/ir/statements.h" -#include "taichi/struct/struct_llvm.h" +#include "taichi/llvm/struct_llvm.h" TLANG_NAMESPACE_BEGIN diff --git a/taichi/llvm/llvm_program.h b/taichi/llvm/llvm_program.h index 0c29326dcc859..06e52b0341fd7 100644 --- a/taichi/llvm/llvm_program.h +++ b/taichi/llvm/llvm_program.h @@ -14,7 +14,7 @@ #include "taichi/runtime/runtime.h" #include "taichi/system/threading.h" #include "taichi/struct/struct.h" -#include "taichi/struct/struct_llvm.h" +#include "taichi/llvm/struct_llvm.h" #include "taichi/program/snode_expr_utils.h" #include "taichi/system/memory_pool.h" #include "taichi/program/program_impl.h" diff --git a/taichi/struct/struct_llvm.cpp b/taichi/llvm/struct_llvm.cpp similarity index 99% rename from taichi/struct/struct_llvm.cpp rename to taichi/llvm/struct_llvm.cpp index adf6a9be08a9b..61917013fc802 100644 --- a/taichi/struct/struct_llvm.cpp +++ b/taichi/llvm/struct_llvm.cpp @@ -1,5 +1,4 @@ -#ifdef TI_WITH_LLVM -#include "taichi/struct/struct_llvm.h" +#include "taichi/llvm/struct_llvm.h" #include "llvm/IR/Verifier.h" #include "llvm/IR/IRBuilder.h" @@ -363,5 +362,3 @@ llvm::Function *StructCompilerLLVM::create_function(llvm::FunctionType *ft, } // namespace lang } // namespace taichi - -#endif //#ifdef TI_WITH_LLVM diff --git a/taichi/struct/struct_llvm.h b/taichi/llvm/struct_llvm.h similarity index 97% rename from taichi/struct/struct_llvm.h rename to taichi/llvm/struct_llvm.h index 5a725381ae7e5..3b887d7ee9c29 100644 --- a/taichi/struct/struct_llvm.h +++ b/taichi/llvm/struct_llvm.h @@ -1,6 +1,5 @@ #pragma once -#ifdef TI_WITH_LLVM // Codegen for the hierarchical data structure (LLVM) #include "taichi/llvm/llvm_program.h" #include "taichi/llvm/llvm_codegen_utils.h" @@ -56,5 +55,3 @@ class StructCompilerLLVM : public StructCompiler, public LLVMModuleBuilder { } // namespace lang } // namespace taichi - -#endif //#ifdef TI_WITH_LLVM diff --git a/taichi/program/program.cpp b/taichi/program/program.cpp index 544bc9051192a..af3accf876e45 100644 --- a/taichi/program/program.cpp +++ b/taichi/program/program.cpp @@ -6,7 +6,6 @@ #include "taichi/program/extension.h" #include "taichi/backends/cpu/codegen_cpu.h" #include "taichi/struct/struct.h" -#include "taichi/struct/struct_llvm.h" #include "taichi/backends/metal/api.h" #include "taichi/backends/wasm/aot_module_builder_impl.h" #include "taichi/runtime/program_impls/opengl/opengl_program.h" diff --git a/tests/cpp/codegen/refine_coordinates_test.cpp b/tests/cpp/codegen/refine_coordinates_test.cpp index 1498edf923938..f96150c0c7eab 100644 --- a/tests/cpp/codegen/refine_coordinates_test.cpp +++ b/tests/cpp/codegen/refine_coordinates_test.cpp @@ -13,7 +13,7 @@ #include "taichi/program/compile_config.h" #include "taichi/program/program.h" #include "taichi/llvm/llvm_program.h" -#include "taichi/struct/struct_llvm.h" +#include "taichi/llvm/struct_llvm.h" namespace taichi {