Get Makefile working

This leverages julia#59108 to generate a log file with the information
needed to create a language binding. As that PR is not yet merged, this
may be subject to change.

This appears to get things working up through trimming, at which point
there are many verifier errors that need to be resolved.

Author: timholy

.gitignore

@@ -4,3 +4,5 @@
 /Manifest.toml
 /docs/Manifest.toml
 /docs/build/
+/language_wrappers/Manifest.toml
+/language_wrappers/bindinginfo_libNMFMerge.log

.vscode/settings.json

@@ -13,9 +13,9 @@ endif
 #=============================================================================
 # location of test source
 SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-PKGDIR := $(dir $(SRCDIR))
+PKGDIR := $(abspath $(dir $(SRCDIR)))
 JULIAHOME := $(abspath $(JULIA)/../..)
-BUILDSCRIPT := $(BIN)/../share/julia/juliac-buildscript.jl
+# BUILDSCRIPT := $(BIN)/../share/julia/juliac-buildscript.jl
 # include $(JULIAHOME)/Make.inc
 
 # FIXME
@@ -26,24 +26,28 @@ EXE := $(suffix $(abspath $(JULIA)))
 
 # get compiler and linker flags. (see: `contrib/julia-config.jl`)
 JULIA_CONFIG := $(JULIA) -e 'include(joinpath(Sys.BINDIR, Base.DATAROOTDIR, "julia", "julia-config.jl"))' --
+JULIA_LIBDIR := $(shell $(JULIA) -e 'println(joinpath(Sys.BINDIR, "..", "lib"))' --)
 CPPFLAGS_ADD :=
 CFLAGS_ADD = $(shell $(JULIA_CONFIG) --cflags)
 LDFLAGS_ADD = -lm $(shell $(JULIA_CONFIG) --ldflags --ldlibs) -ljulia-internal
 
+# get the JuliaC build script
+JULIAC_BUILDSCRIPT := $(shell $(JULIA) -e 'print(joinpath(Sys.BINDIR, Base.DATAROOTDIR, "julia", "juliac", "juliac-buildscript.jl"))')
+
 #=============================================================================
 
-release: NMFMerge-jl.$(SHLIB_EXT)
+release: libNMFMerge-o.a
 
-NMFMerge-jl.$(SHLIB_EXT): $(PKGDIR)/src/NMFMerge.jl $(BUILDSCRIPT)
-	$(JULIA) -t 1 -J $(BIN)/../lib/julia/sys.$(SHLIB_EXT) --project --startup-file=no --history-file=no --output-incremental=no --strip-ir --strip-metadata --experimental --trim $(BUILDSCRIPT) $(SRCDIR)/lib.jl --output-lib NMFMerge-jl.so
+$(BIN)/libNMFMerge-o.a: $(PKGDIR)/language_wrappers/lib.jl $(JULIAC_BUILDSCRIPT)
+	$(JULIA) -t 1 -J $(JULIA_LIBDIR)/julia/sys.$(SHLIB_EXT) --startup-file=no --history-file=no --project=$(PKGDIR)/language_wrappers/ --output-o $@ --output-incremental=no --strip-ir --strip-metadata --experimental --trim $(JULIAC_BUILDSCRIPT) $< --output-lib true $(BIN)/bindinginfo_libNMFMerge.log
 
-check: hello$(EXE) basic_jll$(EXE)   # FIXME
-	$(JULIA) --depwarn=error $(SRCDIR)/../runtests.jl $(SRCDIR)/trimming
+# check: $(BIN)/libNMFMerge$(EXE)
+# 	$(JULIA) --depwarn=error $(SRCDIR)/trimming.jl $<
 
-clean:  # FIXME
-	-rm -f hello$(EXE) basic_jll$(EXE) init.o hello.o basic_jll.o
+clean:
+	-rm -f $(BIN)/libNMFMerge-o.a $(BIN)/bindinginfo_libNMFMerge.log
 
-.PHONY: release clean check
+.PHONY: release clean
 
 # Makefile debugging trick:
 # call print-VARIABLE to see the runtime value of any variable

language_wrappers/Makefile

@@ -1,2 +1,5 @@
 [deps]
 NMFMerge = "9cc52eda-dfaf-4e21-aae3-9f26bed153a3"
+
+[sources]
+NMFMerge = {path = ".."}

language_wrappers/Manifest.toml

@@ -8,10 +8,21 @@ struct ReturnValue
     objvalue::Float64
 end
 
-Base.@ccallable function nmfmerge_inplace(Wout::Matrix{Float64}, Hout::Matrix{Float64}, X::Matrix{Float64}, ncomponents::Int32, tol::Float64, maxiter::Int32)::ReturnValue
+struct CMatrix{T} <: AbstractMatrix{T}
+    data::Ptr{T}
+    rows::Int32
+    cols::Int32
+end
+
+Base.@ccallable function nmfmerge_inplace(Wout::CMatrix{Float64}, Hout::CMatrix{Float64}, X::CMatrix{Float64}, ncomponents::Int32, tol::Float64, maxiter::Int32)::ReturnValue
+    Wout.rows == X.rows || throw(ArgumentError("Wout and X must have the same number of rows"))
+    Hout.cols == X.cols || throw(ArgumentError("Hout and X must have the same number of columns"))
+    W, H, X = unsafe_wrap(Array, Wout.data, (Wout.rows, Wout.cols)),
+              unsafe_wrap(Array, Hout.data, (Hout.rows, Hout.cols)),
+              unsafe_wrap(Array, X.data, (X.rows, X.cols))
     result = nmfmerge(X, ncomponents; tol_final=tol, maxiter)
-    Wout .= result.W
-    Hout .= result.H
+    W .= result.W
+    H .= result.H
     return ReturnValue(result.niters, result.converged, result.objvalue)
 end