Use zig build only

.formatter.exs

@@ -2,7 +2,7 @@ locals_without_parens = [deftype: 1, defattr: 1, defop: 2, defalias: 2]
 # Used by "mix format"
 [
   locals_without_parens: locals_without_parens,
-  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"],
+  inputs: ["{mix,.formatter}.exs", "{config,lib,test,scripts}/**/*.{ex,exs}"],
   export: [
     locals_without_parens: locals_without_parens
   ]

.github/workflows/elixir.yml

@@ -87,4 +87,6 @@ jobs:
         if: failure()
         with:
           name: beaver-tmp-${{ github.run_number }}-${{ github.run_attempt }}
-          path: ./tmp/**/*.zig
+          path: |
+            _build/*/lib/beaver/cmake_build/build.ninja
+            native/mlir-zig-proj/libs.zig

.github/workflows/release.yml

@@ -74,13 +74,13 @@ jobs:
           BEAVER_BUILD_CMAKE=1 mix compile
       - env:
           MIX_ENV: prod
-        run: tree _build/${MIX_ENV}/lib/beaver/native_install
+        run: tree _build/${MIX_ENV}/lib/beaver/priv
       - name: Run patchelf
         env:
           MIX_ENV: prod
         run: |
           set -u
-          find _build/${MIX_ENV}/lib/beaver/native_install/lib -name "*.so*" -maxdepth 1 -type f | while read sofile; do
+          find _build/${MIX_ENV}/lib/beaver/priv/lib -name "*.so*" -maxdepth 1 -type f | while read sofile; do
             echo "==> working on: $sofile"
 
             echo "==> before replace needed"
@@ -106,13 +106,13 @@ jobs:
           MIX_ENV: prod
         run: |
           set -u
-          ls _build/${MIX_ENV}/lib/beaver/native_install/lib
-          LIB_FINAL_SO=$(ls _build/${MIX_ENV}/lib/beaver/native_install/lib | grep -E "libbeaver.+so")
+          ls _build/${MIX_ENV}/lib/beaver/priv/lib
+          LIB_FINAL_SO=$(ls _build/${MIX_ENV}/lib/beaver/priv/lib | grep -E "libbeaver.+so")
           LIB_FINAL_NAME=${LIB_FINAL_SO}.tar.gz
           tar --dereference -cvzf ${LIB_FINAL_NAME} \
-            -C $PWD/_build/${MIX_ENV}/lib/beaver/native_install/lib $(cd $PWD/_build/${MIX_ENV}/lib/beaver/native_install/lib && ls *.so) \
-            -C $PWD/_build/${MIX_ENV}/lib/beaver/native_install/lib $(cd $PWD/_build/${MIX_ENV}/lib/beaver/native_install/lib && ls *.dylib) \
-            -C $PWD/_build/${MIX_ENV}/lib/beaver/native_install $(cd $PWD/_build/${MIX_ENV}/lib/beaver/native_install && ls *.ex)
+            -C $PWD/_build/${MIX_ENV}/lib/beaver/priv/lib $(cd $PWD/_build/${MIX_ENV}/lib/beaver/priv/lib && ls *.so) \
+            -C $PWD/_build/${MIX_ENV}/lib/beaver/priv/lib $(cd $PWD/_build/${MIX_ENV}/lib/beaver/priv/lib && ls *.dylib) \
+            -C $PWD/_build/${MIX_ENV}/lib/beaver/priv $(cd $PWD/_build/${MIX_ENV}/lib/beaver/priv && ls *.ex)
           echo "LIB_FINAL_NAME=${LIB_FINAL_NAME}" >> $GITHUB_OUTPUT
       - name: Purge artifacts
         run: |

.gitignore

@@ -36,3 +36,6 @@ checksum-*.exs
 beaver-*.tar
 
 .elixir_ls
+lib/beaver/mlir/capi_functions.exs
+native/mlir-zig-proj/src/wrapper.zig
+checksum.exs

Makefile

@@ -3,9 +3,36 @@ LLVM_LIB_DIR := $(shell ${LLVM_CONFIG_PATH} --libdir)
 LLVM_CMAKE_DIR = $(LLVM_LIB_DIR)/cmake/llvm
 MLIR_CMAKE_DIR = $(LLVM_LIB_DIR)/cmake/mlir
 CMAKE_BUILD_DIR = ${MIX_APP_PATH}/cmake_build
-NATIVE_INSTALL_DIR = ${MIX_APP_PATH}/native_install
-cmake_build:
-	cmake -G Ninja -S native/mlir-c -B ${CMAKE_BUILD_DIR} -DLLVM_DIR=${LLVM_CMAKE_DIR} -DMLIR_DIR=${MLIR_CMAKE_DIR} -DCMAKE_INSTALL_PREFIX=${NATIVE_INSTALL_DIR}
+CMAKE_INSTALL_DIR = ${MIX_APP_PATH}/cmake_install
+NATIVE_INSTALL_DIR = ${MIX_APP_PATH}/priv
+MLIR_INCLUDE_DIR = ${LLVM_LIB_DIR}/../include
+BEAVER_INCLUDE_DIR = native/mlir-zig-proj/mlir-c/include
+ZIG_CACHE_DIR = ${MIX_APP_PATH}/zig_cache
+.PHONY: all cmake_config zig_build cmake_build
+
+all: cmake_config zig_build cmake_build
+
+zig_build: cmake_config
+	mkdir -p ${NATIVE_INSTALL_DIR}
+	zig translate-c ${BEAVER_INCLUDE_DIR}/mlir-c/Beaver/wrapper.h --cache-dir ${ZIG_CACHE_DIR} \
+		-I ${BEAVER_INCLUDE_DIR} \
+		-I ${MLIR_INCLUDE_DIR} | elixir scripts/update_generated.exs \
+			--elixir ${NATIVE_INSTALL_DIR}/kinda-meta-lib${KINDA_LIB_NAME}.ex \
+			--elixir lib/beaver/mlir/capi_functions.exs \
+			--zig native/mlir-zig-proj/src/wrapper.zig
+	zig fmt native/mlir-zig-proj/
+	cd native/mlir-zig-proj && zig build --cache-dir ${ZIG_CACHE_DIR} \
+	  --prefix ${NATIVE_INSTALL_DIR} \
+		--search-prefix mlir-c \
+		--search-prefix ${NATIVE_INSTALL_DIR} \
+		--search-prefix ${LLVM_LIB_DIR}/.. \
+		--search-prefix ${ERTS_INCLUDE_DIR}/.. \
+		-freference-trace \
+		-DKINDA_LIB_NAME=${KINDA_LIB_NAME}
+cmake_config:
+	cmake -G Ninja -S native/mlir-zig-proj/mlir-c -B ${CMAKE_BUILD_DIR} -DLLVM_DIR=${LLVM_CMAKE_DIR} -DMLIR_DIR=${MLIR_CMAKE_DIR} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_DIR}
+	elixir scripts/get_libs.exs
+cmake_build: cmake_config
 	cmake --build ${CMAKE_BUILD_DIR} --target install
 
 clean:

config/config.exs

@@ -1,8 +1,3 @@
 import Config
 
 import_config "#{config_env()}.exs"
-
-if Mix.env() in [:dev, :test] do
-  config :mix_test_watch,
-    extra_extensions: [".zig", ".cpp"]
-end

lib/beaver/exterior/exterior.ex

@@ -11,7 +11,7 @@ defmodule Beaver.Exterior do
 
   def register_all(ctx) do
     # TODO: get it from app config or other mechanism
-    for dialect <- [Beaver.Exterior.Elixir] do
+    for dialect <- [] do
       :ok = dialect.register_dialect(ctx)
     end
   end

lib/beaver/mlir/capi.ex

@@ -5,18 +5,7 @@ defmodule Beaver.MLIR.CAPI do
 
   require Logger
 
-  dest_dir = Path.join([Mix.Project.app_path(), "native_install"])
-
-  llvm_paths =
-    case LLVMConfig.include_dir() do
-      {:ok, include_dir} ->
-        [include_dir]
-
-      _ ->
-        []
-    end
-
-  mlir_c_path = Path.join(File.cwd!(), "native/mlir-c")
+  dest_dir = Path.join([Mix.Project.app_path(), "priv"])
 
   use Kinda.Prebuilt,
     otp_app: :beaver,
@@ -28,24 +17,6 @@ defmodule Beaver.MLIR.CAPI do
         "https://github.com/beaver-lodge/beaver-prebuilt/releases/download/2023-12-23-1442"
       ),
     version: "0.3.2",
-    wrapper: Path.join(mlir_c_path, "include/mlir-c/Beaver/wrapper.h"),
-    zig_proj: "native/mlir-zig-proj",
-    translate_args:
-      List.flatten(
-        for p <-
-              [Path.join(mlir_c_path, "include")] ++
-                llvm_paths do
-          ["-I", p]
-        end
-      ),
-    build_args:
-      List.flatten(
-        for p <-
-              [dest_dir, mlir_c_path] ++
-                Enum.map(llvm_paths, &Path.dirname/1) do
-          ["--search-prefix", p]
-        end
-      ),
     dest_dir: dest_dir,
     forward_module: Beaver.Native,
     code_gen_module: Beaver.MLIR.CAPI.CodeGen,
@@ -55,7 +26,12 @@ defmodule Beaver.MLIR.CAPI do
     ),
     nif_versions: ~w(
       2.16
-    )
+    ),
+    nifs:
+      "lib/beaver/mlir/capi_functions.exs"
+      |> File.read!()
+      |> Code.eval_string()
+      |> elem(0)
 
   llvm_headers =
     case LLVMConfig.include_dir() do