EnzymeAD · mofeing · Nov 12, 2024
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -89,16 +89,16 @@ jobs:
         id: build_libreactant
         run: |
           python -m pip install numpy
-          julia --color=yes --project=deps -e 'using Pkg; Pkg.instantiate()'
-          julia --color=yes --project=deps deps/build_local.jl
+          julia --color=yes --project=lib/ReactantExtra -e 'using Pkg; Pkg.instantiate()'
+          julia --color=yes --project=lib/ReactantExtra lib/ReactantExtra/build_local.jl
           cp LocalPreferences.toml test/
       - name: Build libReactant MacOS
         if: ${{ matrix.libReactant == 'local' && matrix.os == 'macOS-latest'}}
         id: build_libreactant_mac
         run: |
           python -m pip install numpy
-          julia --color=yes --project=deps -e 'using Pkg; Pkg.instantiate()'
-          SDKROOT=`xcrun --show-sdk-path` julia --color=yes --project=deps deps/build_local.jl
+          julia --color=yes --project=lib/ReactantExtra -e 'using Pkg; Pkg.instantiate()'
+          SDKROOT=`xcrun --show-sdk-path` julia --color=yes --project=lib/ReactantExtra lib/ReactantExtra/build_local.jl
           cp LocalPreferences.toml test/
       - name: "Install Dependencies and Run Tests"
         run: |

diff --git a/.github/workflows/regenerate-mlir-bindings.yml b/.github/workflows/regenerate-mlir-bindings.yml
@@ -30,12 +30,12 @@ jobs:
           Pkg.precompile()
           using Clang
           Clang.JLLEnvs.get_system_includes()
-        working-directory: ./deps/ReactantExtra
+        working-directory: ./lib/ReactantExtra
         env:
           JULIA_DEPOT_PATH: ${{ runner.temp }}/julia_depot
       - name: Generate MLIR Bindings
         run: julia --project=. --color=yes make-bindings.jl
-        working-directory: ./deps/ReactantExtra
+        working-directory: ./lib/ReactantExtra
         env:
           JULIA_DEPOT_PATH: ${{ runner.temp }}/julia_depot
       - run: |

diff --git a/.gitignore b/.gitignore
@@ -265,8 +265,8 @@ Manifest.toml
 # Built Visual Studio Code Extensions
 *.vsix
 
-deps/ReactantExtra/bazel-*
-deps/ReactantExtra/MODULE.bazel.lock
+lib/ReactantExtra/bazel-*
+lib/ReactantExtra/MODULE.bazel.lock
 *.swp
 *.swo
 external

diff --git a/deps/ReactantExtra/Project.toml b/deps/ReactantExtra/Project.toml
diff --git a/deps/clang b/deps/clang
diff --git a/deps/clang++ b/deps/clang++
diff --git a/deps/gcc b/deps/gcc
diff --git a/deps/ReactantExtra/.bazelrc → lib/ReactantExtra/.bazelrc b/deps/ReactantExtra/.bazelrc → lib/ReactantExtra/.bazelrc
diff --git a/deps/ReactantExtra/.bazelversion → lib/ReactantExtra/.bazelversion b/deps/ReactantExtra/.bazelversion → lib/ReactantExtra/.bazelversion
diff --git a/deps/ReactantExtra/API.cpp → lib/ReactantExtra/API.cpp b/deps/ReactantExtra/API.cpp → lib/ReactantExtra/API.cpp
diff --git a/deps/ReactantExtra/BUILD → lib/ReactantExtra/BUILD b/deps/ReactantExtra/BUILD → lib/ReactantExtra/BUILD
@@ -183,8 +183,6 @@ cc_toolchain_config(
     target_system_name = "x86_64-unknown-linux-gnu",
     tool_paths = {
         "/usr/bin/gcc": "/home/wmoses/llvms/llvm16/install/bin/clang",
-        # "/usr/bin/gcc": "/home/wmoses/git/Reactant.jl/deps/clang",
-        # "gcc": "/home/wmoses/git/Reactant.jl/deps/clang",
         "gcc": "/home/wmoses/llvms/llvm16/install/bin/clang",
 		"g++": "/home/wmoses/llvms/llvm16/install/bin/clang++",
 		"cpp": "/home/wmoses/llvms/llvm16/install/bin/clang++",

diff --git a/deps/ReactantExtra/MODULE.bazel → lib/ReactantExtra/MODULE.bazel b/deps/ReactantExtra/MODULE.bazel → lib/ReactantExtra/MODULE.bazel
diff --git a/deps/Project.toml → lib/ReactantExtra/Project.toml b/deps/Project.toml → lib/ReactantExtra/Project.toml
diff --git a/deps/ReactantExtra/WORKSPACE → lib/ReactantExtra/WORKSPACE b/deps/ReactantExtra/WORKSPACE → lib/ReactantExtra/WORKSPACE
diff --git a/deps/build_local.jl → lib/ReactantExtra/build_local.jl b/deps/build_local.jl → lib/ReactantExtra/build_local.jl
@@ -1,5 +1,5 @@
 # Invoke with
-# `julia --project=deps deps/build_local.jl [dbg/opt] [auto/cpu/cuda]`
+# `julia --project=lib/ReactantExtra lib/ReactantExtra/build_local.jl [dbg/opt] [auto/cpu/cuda]`
 
 # the pre-built ReactantExtra_jll might not be loadable on this platform
 Reactant_jll = Base.UUID("0192cb87-2b54-54ad-80e0-3be72ad8a3c0")

diff --git a/deps/ReactantExtra/make-bindings.jl → lib/ReactantExtra/make-bindings.jl b/deps/ReactantExtra/make-bindings.jl → lib/ReactantExtra/make-bindings.jl
diff --git a/deps/ReactantExtra/make.jl → lib/ReactantExtra/make.jl b/deps/ReactantExtra/make.jl → lib/ReactantExtra/make.jl
diff --git a/deps/ReactantExtra/missing_defs.jl → lib/ReactantExtra/missing_defs.jl b/deps/ReactantExtra/missing_defs.jl → lib/ReactantExtra/missing_defs.jl
diff --git a/deps/ReactantExtra/tblgen/BUILD → lib/ReactantExtra/tblgen/BUILD b/deps/ReactantExtra/tblgen/BUILD → lib/ReactantExtra/tblgen/BUILD
diff --git a/deps/ReactantExtra/tblgen/CMakeLists.txt → lib/ReactantExtra/tblgen/CMakeLists.txt b/deps/ReactantExtra/tblgen/CMakeLists.txt → lib/ReactantExtra/tblgen/CMakeLists.txt
diff --git a/deps/ReactantExtra/tblgen/LICENSE → lib/ReactantExtra/tblgen/LICENSE b/deps/ReactantExtra/tblgen/LICENSE → lib/ReactantExtra/tblgen/LICENSE
diff --git a/deps/ReactantExtra/tblgen/jl-generators.cc → lib/ReactantExtra/tblgen/jl-generators.cc b/deps/ReactantExtra/tblgen/jl-generators.cc → lib/ReactantExtra/tblgen/jl-generators.cc
diff --git a/deps/ReactantExtra/tblgen/mlir-jl-tblgen.cc → lib/ReactantExtra/tblgen/mlir-jl-tblgen.cc b/deps/ReactantExtra/tblgen/mlir-jl-tblgen.cc → lib/ReactantExtra/tblgen/mlir-jl-tblgen.cc
diff --git a/deps/ReactantExtra/wrap.toml → lib/ReactantExtra/wrap.toml b/deps/ReactantExtra/wrap.toml → lib/ReactantExtra/wrap.toml