test+fix(ci/macos): rename all underscored file names like _types.h t…

…o types.h to prevent possible compilation pitfall
Ziqi-Yang · Aug 4, 2024 · d53e4cb · d53e4cb
1 parent e67fe83
commit d53e4cb
Show file tree

Hide file tree

Showing 33 changed files with 58 additions and 57 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,7 @@ message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
 include_directories(${CMAKE_SOURCE_DIR}/src/llvm)
-include_directories(${CMAKE_SOURCE_DIR}/src/llvm/_types)
+include_directories(${CMAKE_SOURCE_DIR}/src/llvm/types)
 include_directories(${CMAKE_SOURCE_DIR}/src/llvm/Core)
 include_directories(${LLVM_INCLUDE_DIRS})
 
@@ -80,14 +80,14 @@ nanobind_add_module(
   src/llvm/Utils.cpp
   src/llvm/Support.cpp
 
-  src/llvm/_types/PyModule.cpp
-  src/llvm/_types/PyContext.cpp
-  src/llvm/_types/PyMetadataEntries.cpp
-  src/llvm/_types/PyModuleFlagEntries.cpp
-  src/llvm/_types/PyOperandBundle.cpp
-  src/llvm/_types/PyPassManagerBase.cpp
-  src/llvm/_types/PyMemoryBuffer.cpp
-  src/llvm/_types/PyModuleProvider.cpp
+  src/llvm/types/PyModule.cpp
+  src/llvm/types/PyContext.cpp
+  src/llvm/types/PyMetadataEntries.cpp
+  src/llvm/types/PyModuleFlagEntries.cpp
+  src/llvm/types/PyOperandBundle.cpp
+  src/llvm/types/PyPassManagerBase.cpp
+  src/llvm/types/PyMemoryBuffer.cpp
+  src/llvm/types/PyModuleProvider.cpp
 
   ${LLVM_INCLUDE_DIRS}
 )

diff --git a/pyproject.toml b/pyproject.toml
@@ -48,10 +48,10 @@ environment = { SKBUILD_CMAKE_ARGS="-DLLVM_DIR=D:/a/llvmpym/llvmpym/llvm-build/l
 
 [tool.cibuildwheel.macos.environment]
 MACOSX_DEPLOYMENT_TARGET = "14.0"
-# PATH="/opt/homebrew/opt/llvm/bin:$PATH"
+PATH="/opt/homebrew/opt/llvm/bin:$PATH"
 LDFLAGS="-L/opt/homebrew/opt/llvm/lib/c++ -L/opt/homebrew/opt/llvm/lib -lunwind"
 CPPFLAGS="-I/opt/homebrew/opt/llvm/include"
-SKBUILD_CMAKE_ARGS="-DLLVM_DIR=/opt/homebrew/opt/llvm/lib/cmake/llvm"
+# SKBUILD_CMAKE_ARGS="-DLLVM_DIR=/opt/homebrew/opt/llvm/lib/cmake/llvm"
 
 
 
diff --git a/src/llvm/Core.cpp b/src/llvm/Core.cpp
@@ -1,6 +1,6 @@
 #include "Core.h"
-#include "_types.h"
-#include "_utils.h"
+#include "types.h"
+#include "utils.h"
 
 #include "Core/utils.h"
 #include "Core/enum.h"

diff --git a/src/llvm/Core/enum.cpp b/src/llvm/Core/enum.cpp
@@ -1,6 +1,6 @@
 #include "enum.h"
 #include <llvm-c/Core.h>
-#include "../_types.h"
+#include "../types.h"
 
 namespace nb = nanobind;
 

diff --git a/src/llvm/Core/globalFunc.cpp b/src/llvm/Core/globalFunc.cpp
@@ -1,5 +1,7 @@
 #include "globalFunc.h"
 #include <llvm-c/Core.h>
+#include <llvm-c/Core.h>
+#include "../types.h"
 
 namespace nb = nanobind;
 using namespace nb::literals;

diff --git a/src/llvm/Core/globalFunc.h b/src/llvm/Core/globalFunc.h
@@ -2,8 +2,6 @@
 #define LLVMPYM_CORE_GLOBALFUNC_H
 
 #include <nanobind/nanobind.h>
-#include <llvm-c/Core.h>
-#include "../_types.h"
 
 void bindGlobalFunctions(nanobind::module_ &m);
 

diff --git a/src/llvm/Core/iterator.cpp b/src/llvm/Core/iterator.cpp
@@ -1,6 +1,5 @@
 #include "iterator.h"
-
-#include "../_types.h"
+#include "../types.h"
 
 namespace nb = nanobind;
 using namespace nb::literals;

diff --git a/src/llvm/Core/miscClasses.cpp b/src/llvm/Core/miscClasses.cpp
@@ -6,8 +6,8 @@
 #include <fmt/core.h>
 #include <optional>
 #include <stdexcept>
-#include "../_types.h"
-#include "../_utils.h"
+#include "../types.h"
+#include "../utils.h"
 #include "utils.h"
 
 namespace nb = nanobind;

diff --git a/src/llvm/Core/type.cpp b/src/llvm/Core/type.cpp
@@ -6,8 +6,8 @@
 #include <llvm-c/Core.h>
 #include <fmt/core.h>
 #include <optional>
-#include "../_types.h"
-#include "../_utils.h"
+#include "../types.h"
+#include "../utils.h"
 #include "utils.h"
 
 namespace nb = nanobind;

diff --git a/src/llvm/Core/type.h b/src/llvm/Core/type.h
@@ -1,5 +1,5 @@
-#ifndef LLVMPYM_CORE_TYPES_H
-#define LLVMPYM_CORE_TYPES_H
+#ifndef LLVMPYM_CORE_TYPE_H
+#define LLVMPYM_CORE_TYPE_H
 
 #include <nanobind/nanobind.h>
 

diff --git a/src/llvm/Core/utils.h b/src/llvm/Core/utils.h
@@ -3,7 +3,7 @@
 
 #include <nanobind/nanobind.h>
 #include <llvm-c/Core.h>
-#include "../_types.h"
+#include "../types.h"
 #include <fmt/core.h>
 #include <string>
 

diff --git a/src/llvm/Core/value.cpp b/src/llvm/Core/value.cpp
@@ -6,8 +6,8 @@
 #include <nanobind/stl/tuple.h>
 #include <fmt/core.h>
 #include <optional>
-#include "../_types.h"
-#include "../_utils.h"
+#include "../types.h"
+#include "../utils.h"
 #include "utils.h"
 
 namespace nb = nanobind;

diff --git a/src/llvm/Utils.cpp b/src/llvm/Utils.cpp
@@ -2,7 +2,7 @@
 #include <llvm-c/Core.h>
 #include <nanobind/stl/string.h>
 #include "Utils.h"
-#include "_types.h"
+#include "types.h"
 #include "Core/utils.h"
 
 namespace nb = nanobind;

diff --git a/src/llvm/_types.h → src/llvm/types.h b/src/llvm/_types.h → src/llvm/types.h
@@ -2,6 +2,7 @@
 //
 // ====================================
 
+// note the flag has extra underscore
 #ifndef LLVMPYM__TYPES_H
 #define LLVMPYM__TYPES_H
 
@@ -13,16 +14,16 @@
 #include <unordered_map>
 #include <mutex>
 
-#include "_types/PyModule.h"
-#include "_types/PyContext.h"
-#include "_types/PyMetadataEntries.h"
-#include "_types/PyModuleFlagEntries.h"
-#include "_types/PyOperandBundle.h"
-#include "_types/PyPassManagerBase.h"
-#include "_types/PyMemoryBuffer.h"
-#include "_types/PyModuleProvider.h"
-#include "_types/PyLLVMObject.h"
-#include "_types/PyLLVMObject.h"
+#include "types/PyModule.h"
+#include "types/PyContext.h"
+#include "types/PyMetadataEntries.h"
+#include "types/PyModuleFlagEntries.h"
+#include "types/PyOperandBundle.h"
+#include "types/PyPassManagerBase.h"
+#include "types/PyMemoryBuffer.h"
+#include "types/PyModuleProvider.h"
+#include "types/PyLLVMObject.h"
+#include "types/PyLLVMObject.h"
 
 
 #define DEFINE_PY_WRAPPER_CLASS(ClassName, UnderlyingType) \

diff --git a/src/llvm/_types/PyContext.cpp → src/llvm/types/PyContext.cpp b/src/llvm/_types/PyContext.cpp → src/llvm/types/PyContext.cpp
diff --git a/src/llvm/_types/PyContext.h → src/llvm/types/PyContext.h b/src/llvm/_types/PyContext.h → src/llvm/types/PyContext.h
@@ -1,5 +1,5 @@
-#ifndef LLVMPYM__TYPES_PYCONTEXT_H
-#define LLVMPYM__TYPES_PYCONTEXT_H
+#ifndef LLVMPYM_TYPES_PYCONTEXT_H
+#define LLVMPYM_TYPES_PYCONTEXT_H
 
 #include <llvm-c/Core.h>
 #include <stdexcept>

diff --git a/src/llvm/_types/PyLLVMObject.h → src/llvm/types/PyLLVMObject.h b/src/llvm/_types/PyLLVMObject.h → src/llvm/types/PyLLVMObject.h
@@ -1,5 +1,5 @@
-#ifndef PYLLVMOBJECT_H
-#define PYLLVMOBJECT_H
+#ifndef LLVMPYM_TYPES_PYLLVMOBJECT_H
+#define LLVMPYM_TYPES_PYLLVMOBJECT_H
 
 #include <iostream>
 #include <memory>

diff --git a/src/llvm/_types/PyMemoryBuffer.cpp → src/llvm/types/PyMemoryBuffer.cpp b/src/llvm/_types/PyMemoryBuffer.cpp → src/llvm/types/PyMemoryBuffer.cpp
diff --git a/src/llvm/_types/PyMemoryBuffer.h → src/llvm/types/PyMemoryBuffer.h b/src/llvm/_types/PyMemoryBuffer.h → src/llvm/types/PyMemoryBuffer.h
@@ -1,5 +1,5 @@
-#ifndef LLVMPYM__TYPES_PYMEMORYBUFFER_H
-#define LLVMPYM__TYPES_PYMEMORYBUFFER_H
+#ifndef LLVMPYM_TYPES_PYMEMORYBUFFER_H
+#define LLVMPYM_TYPES_PYMEMORYBUFFER_H
 
 #include <llvm-c/Core.h>
 #include <memory>

diff --git a/src/llvm/_types/PyMetadataEntries.cpp → src/llvm/types/PyMetadataEntries.cpp b/src/llvm/_types/PyMetadataEntries.cpp → src/llvm/types/PyMetadataEntries.cpp
diff --git a/src/llvm/_types/PyMetadataEntries.h → src/llvm/types/PyMetadataEntries.h b/src/llvm/_types/PyMetadataEntries.h → src/llvm/types/PyMetadataEntries.h
@@ -1,5 +1,5 @@
-#ifndef LLVMPYM__TYPES_PYMETADATAENTRIES_H
-#define LLVMPYM__TYPES_PYMETADATAENTRIES_H
+#ifndef LLVMPYM_TYPES_PYMETADATAENTRIES_H
+#define LLVMPYM_TYPES_PYMETADATAENTRIES_H
 
 #include <llvm-c/Core.h>
 #include <memory>

diff --git a/src/llvm/_types/PyModule.cpp → src/llvm/types/PyModule.cpp b/src/llvm/_types/PyModule.cpp → src/llvm/types/PyModule.cpp
diff --git a/src/llvm/_types/PyModule.h → src/llvm/types/PyModule.h b/src/llvm/_types/PyModule.h → src/llvm/types/PyModule.h
@@ -1,5 +1,5 @@
-#ifndef LLVMPYM__TYPES_PYMODULE_H
-#define LLVMPYM__TYPES_PYMODULE_H
+#ifndef LLVMPYM_TYPES_PYMODULE_H
+#define LLVMPYM_TYPES_PYMODULE_H
 
 #include <llvm-c/Core.h>
 #include <memory>

diff --git a/src/llvm/_types/PyModuleFlagEntries.cpp → src/llvm/types/PyModuleFlagEntries.cpp b/src/llvm/_types/PyModuleFlagEntries.cpp → src/llvm/types/PyModuleFlagEntries.cpp
diff --git a/src/llvm/_types/PyModuleFlagEntries.h → src/llvm/types/PyModuleFlagEntries.h b/src/llvm/_types/PyModuleFlagEntries.h → src/llvm/types/PyModuleFlagEntries.h
@@ -1,5 +1,5 @@
-#ifndef LLVMPYM__TYPES_PYMODULEFLAGENTRIES_H
-#define LLVMPYM__TYPES_PYMODULEFLAGENTRIES_H
+#ifndef LLVMPYM_TYPES_PYMODULEFLAGENTRIES_H
+#define LLVMPYM_TYPES_PYMODULEFLAGENTRIES_H
 
 #include <llvm-c/Core.h>
 #include <memory>

diff --git a/src/llvm/_types/PyModuleProvider.cpp → src/llvm/types/PyModuleProvider.cpp b/src/llvm/_types/PyModuleProvider.cpp → src/llvm/types/PyModuleProvider.cpp
diff --git a/src/llvm/_types/PyModuleProvider.h → src/llvm/types/PyModuleProvider.h b/src/llvm/_types/PyModuleProvider.h → src/llvm/types/PyModuleProvider.h
@@ -1,5 +1,5 @@
-#ifndef LLVMPYM__TYPES_PYMODULEPROVIDER_H
-#define LLVMPYM__TYPES_PYMODULEPROVIDER_H
+#ifndef LLVMPYM_TYPES_PYMODULEPROVIDER_H
+#define LLVMPYM_TYPES_PYMODULEPROVIDER_H
 
 #include <llvm-c/Core.h>
 #include <memory>

diff --git a/src/llvm/_types/PyOperandBundle.cpp → src/llvm/types/PyOperandBundle.cpp b/src/llvm/_types/PyOperandBundle.cpp → src/llvm/types/PyOperandBundle.cpp
diff --git a/src/llvm/_types/PyOperandBundle.h → src/llvm/types/PyOperandBundle.h b/src/llvm/_types/PyOperandBundle.h → src/llvm/types/PyOperandBundle.h
@@ -1,5 +1,5 @@
-#ifndef PYOPERANDBUNDLE_H
-#define PYOPERANDBUNDLE_H
+#ifndef LLVMPYM_TYPES_PYOPERANDBUNDLE_H
+#define LLVMPYM_TYPES_PYOPERANDBUNDLE_H
 
 #include <llvm-c/Core.h>
 #include <memory>

diff --git a/src/llvm/_types/PyPassManagerBase.cpp → src/llvm/types/PyPassManagerBase.cpp b/src/llvm/_types/PyPassManagerBase.cpp → src/llvm/types/PyPassManagerBase.cpp
diff --git a/src/llvm/_types/PyPassManagerBase.h → src/llvm/types/PyPassManagerBase.h b/src/llvm/_types/PyPassManagerBase.h → src/llvm/types/PyPassManagerBase.h
@@ -1,5 +1,5 @@
-#ifndef LLVMPYM__TYPES_PYPASSMANAGERBASE_H
-#define LLVMPYM__TYPES_PYPASSMANAGERBASE_H
+#ifndef LLVMPYM_TYPES_PYPASSMANAGERBASE_H
+#define LLVMPYM_TYPES_PYPASSMANAGERBASE_H
 
 #include <llvm-c/Core.h>
 #include <memory>

diff --git a/src/llvm/_utils.h → src/llvm/utils.h b/src/llvm/_utils.h → src/llvm/utils.h
@@ -1,3 +1,4 @@
+// note the flag has extra underscore
 #ifndef LLVMPYM__UTILS_H
 #define LLVMPYM__UTILS_H
 

diff --git a/src/llvmpym_ext.cpp b/src/llvmpym_ext.cpp
@@ -3,7 +3,7 @@
 #include "llvm/ErrorHandling.h"
 #include "llvm/Utils.h"
 #include "llvm/Support.h"
-#include "llvm/_types.h"
+#include "llvm/types.h"
 
 namespace nb = nanobind;
 using namespace nb::literals;