Remove libcmt, use native ObjectiveC FFI (#117)

.buildkite/pipeline.yml

@@ -15,8 +15,6 @@ steps:
                 - src
                 - lib
                 - examples
-        command: |
-          julia --project=deps deps/build_ci.jl
         agents:
           queue: "juliaecosystem"
           os: "macos"
@@ -37,8 +35,6 @@ steps:
       #           - src
       #           - lib
       #           - examples
-      #   command: |
-      #     julia --project=deps deps/build_ci.jl
       #   agents:
       #     queue: "juliaecosystem"
       #     os: "macos"
@@ -58,8 +54,6 @@ steps:
       #           - src
       #           - lib
       #           - examples
-      #   command: |
-      #     julia --project=deps deps/build_ci.jl
       #   agents:
       #     queue: "juliaecosystem"
       #     os: "macos"
@@ -86,8 +80,6 @@ steps:
                 - src
                 - lib
                 - examples
-        command: |
-          julia --project=deps deps/build_ci.jl
         env:
           MTL_DEBUG_LAYER: '1'
           MTL_SHADER_VALIDATION: '1'

Manifest.toml

@@ -2,7 +2,7 @@
 
 julia_version = "1.8.5"
 manifest_format = "2.0"
-project_hash = "97c97a79809f4555c5aae0f6b4c9553a7330505e"
+project_hash = "f5746c1a98e06b2349e32c5d2131234120f2cc34"
 
 [[deps.Adapt]]
 deps = ["LinearAlgebra", "Requires"]
@@ -143,6 +143,12 @@ version = "2022.2.1"
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 version = "1.2.0"
 
+[[deps.ObjectiveC]]
+deps = ["CEnum"]
+git-tree-sha1 = "5b3c98aacd5429e9c367e551134d9466e40ed6d5"
+uuid = "e86c9b32-1129-44ac-8ea0-90d5bb39ded9"
+version = "0.1.0"
+
 [[deps.OpenBLAS_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
 uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
@@ -228,12 +234,6 @@ deps = ["Libdl"]
 uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
 version = "1.2.12+3"
 
-[[deps.cmt_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl"]
-git-tree-sha1 = "049e4965e08ffb1fe62f731c385b92cf62d34817"
-uuid = "65323cdd-17ec-5719-9643-72016a7f97e3"
-version = "0.2.0+0"
-
 [[deps.libblastrampoline_jll]]
 deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
 uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"

Project.toml

@@ -1,8 +1,6 @@
 name = "Metal"
 uuid = "dde4c033-4e86-420c-a63e-0dd931031962"
-authors = ["Filippo Vicentini <filippovicentini@gmail.com>",
-           "Tim Besard <tim.besard@gmail.com>",
-           "Max Hawkins <max.hawkins65@gmail.com>"]
+authors = ["Filippo Vicentini <filippovicentini@gmail.com>", "Tim Besard <tim.besard@gmail.com>", "Max Hawkins <max.hawkins65@gmail.com>"]
 version = "0.2.0"
 
 [deps]
@@ -14,18 +12,18 @@ GPUCompiler = "61eb1bfa-7361-4325-ad38-22787b887f55"
 LLVM = "929cbde3-209d-540e-8aea-75f648917ca0"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Metal_LLVM_Tools_jll = "0418c028-ff8c-56b8-a53e-0f9676ed36fc"
+ObjectiveC = "e86c9b32-1129-44ac-8ea0-90d5bb39ded9"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
-cmt_jll = "65323cdd-17ec-5719-9643-72016a7f97e3"
 
 [compat]
 Adapt = "3"
 CEnum = "0.4"
 ExprTools = "0.1"
 GPUArrays = "8.4"
 GPUCompiler = "0.16, 0.17"
-Reexport = "1.0"
 LLVM = "4.15"
 Metal_LLVM_Tools_jll = "~0.3"
-cmt_jll = "~0.2"
+ObjectiveC = "0.1"
+Reexport = "1.0"
 julia = "1.8"

README.md

@@ -154,61 +154,30 @@ may fail to start.
 
 ## Metal API wrapper
 
-Finally, all of the above functionality is made possible by interfacing with
-the Metal libraries through a [small C library](https://github.com/JuliaGPU/cmt)
-that wraps the ObjectiveC APIs.
-
-These low-level wrappers, along with some slightly higher-level Julia wrappers,
-are available in the `MTL` submodule exported by Metal.jl. All wrapped C
-functions and types start with the `mt` prefix, whereas the Julia wrappers are
-prefixed with `Mtl`:
+Finally, all of the above functionality is made possible by interfacing with the Metal
+libraries through [ObjectiveC.jl](https://github.com/JuliaInterop/ObjectiveC.jl). We provide low-level objects and functions that map  These
+low-level API wrappers, along with some slightly higher-level Julia wrappers, are available
+in the `MTL` submodule exported by Metal.jl:
 
 ```julia
-julia> dev = MtlDevice(1)
-MtlDevice:
- name:             Apple M1 Pro
- lowpower:         false
- headless:         false
- removable:        false
- unified memory:   true
- registry id:      4294969448
- transfer rate:    0
+julia> dev = MTLDevice(1)
+<AGXG13XDevice: 0x14c17f200>
+    name = Apple M1 Pro
 
 julia> dev.name
-"Apple M1 Pro"
+NSString("Apple M1 Pro")
 ```
 
 
 ## Hacking
 
-Metal.jl relies on two binary dependencies (provided as JLLs):
-
-- [cmt](https://github.com/JuliaGPU/Metal.jl/tree/main/deps/cmt)
-- [LLVM with an AIR back-end](https://github.com/JuliaGPU/llvm-metal)
-
-Normally, these dependencies are built on
-[Yggdrasil](https://github.com/JuliaPackaging/Yggdrasil/).
-If you need to make changes to these dependencies, have a look at the
-`build_cmt.jl` and `build_llvm.jl` scripts in the `deps/` folder. These
-scripts build a local version of the dependency, and configure a local
-preference such that any environment depending on the corresponding JLLs will
-pick-up the modified version (i.e., do `julia --project` in a clone
-of `Metal.jl`):
-
-```
-$ julia --project -e 'using Metal; @show MTL.cmt.libcmt'
-MTL.libcmt = "/Users/tim/Julia/depot/artifacts/6adc0ed9a8370ff1e3bb8fbaf36e8519ee11fd96/lib/libcmt.dylib"
-
-$ julia --project=deps deps/build_cmt.jl
-...
-[100%] Built target cmt
-
-$ julia --project -e 'using Metal; @show MTL.cmt.libcmt'
-MTL.libcmt = "/Users/tim/Julia/depot/scratchspaces/dde4c033-4e86-420c-a63e-0dd931031962/cmt/lib/libcmt.dylib"
-```
-
-These scripts are integrated with our CI, and will be triggered if
-the `ci.build_cmt` or `ci.build_llvm` labels are set on a pull request.
+Metal.jl relies on a custom [LLVM with an AIR
+back-end](https://github.com/JuliaGPU/llvm-metal), provided as a JLL. Normally, this JLLis
+built on [Yggdrasil](https://github.com/JuliaPackaging/Yggdrasil/). If you need to make
+changes to the LLVM back-end, have a look at the `build_llvm.jl` in the `deps/` folder. This
+scripts builds a local version of the LLVM back-end, and configures a local preference such
+that any environment depending on the corresponding JLLs will pick-up the modified version
+(i.e., do `julia --project` in a clone of `Metal.jl`).
 
 
 ## Acknowledgements