From 6e9affba2a4afc9c47e8bf392e5b583ff2a23854 Mon Sep 17 00:00:00 2001 From: Sai Saharsh Chittimilla Date: Tue, 14 Jul 2026 17:19:29 +0530 Subject: [PATCH] Makefile: add install/uninstall targets (PREFIX/bin + libexec) (#167, fixes #164) * Add make install/uninstall targets Neither the root Makefile nor c/Makefile had an install target, so 'build+install' never actually installed anything (fixes #164). Adds standard PREFIX/DESTDIR/BINDIR-respecting install and uninstall targets that place glm and coli in $(BINDIR). * Split install: coli in bin/, engine + support files in libexec/ Addresses feedback on #164 from JustVugg and yurivict: coli goes to $(BINDIR), glm/olmoe and their Python support modules (resource_plan.py, doctor.py, openai_server.py, tools/) go to $(LIBEXECDIR) (default $(PREFIX)/libexec/colibri), matching typical Unix/FreeBSD-port conventions for a wrapper vs. its internals. coli now resolves the engine path in this order: 1. $COLI_ENGINE if set (explicit override) 2. glm next to itself (run-in-place from a source checkout, unchanged) 3. $(LIBEXECDIR)/glm (installed layout), also added to sys.path so the Python support modules still import correctly Also adds a 'bench' target (builds iobench) since only cuda-bench existed before. Tested locally (WSL2/Ubuntu): - run-in-place: cd c && python3 coli info -> engine ready - installed: make install PREFIX=$HOME/.local && ~/.local/bin/coli info -> engine ready (found via libexec) - make uninstall cleans both bin/ and libexec/colibri/ fully --- Makefile | 6 +++--- c/Makefile | 24 +++++++++++++++++++++++- c/coli | 30 ++++++++++++++++++++++++++++-- 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4da2ce1..9a20b7a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all glm portable test check cuda-test clean +.PHONY: all glm portable test check cuda-test clean install uninstall -all glm portable test check cuda-test clean: - $(MAKE) -C c $@ +all glm portable test check cuda-test clean install uninstall: + $(MAKE) -C c $@ \ No newline at end of file diff --git a/c/Makefile b/c/Makefile index 24e848e..dcc92d1 100644 --- a/c/Makefile +++ b/c/Makefile @@ -71,6 +71,12 @@ EXE = endif endif +# --- install --- +PREFIX ?= /usr/local +BINDIR ?= $(PREFIX)/bin +LIBEXECDIR ?= $(PREFIX)/libexec/colibri +INSTALL ?= install + # CUDA=1 adds an opt-in backend for resident tensors. The default build remains # pure C and keeps the original zero-dependency runtime. # @@ -222,7 +228,23 @@ check: $(MAKE) portable $(MAKE) test +install: glm$(EXE) olmoe$(EXE) + $(INSTALL) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -d $(DESTDIR)$(LIBEXECDIR) + $(INSTALL) -d $(DESTDIR)$(LIBEXECDIR)/tools + $(INSTALL) -m 755 coli $(DESTDIR)$(BINDIR)/coli + $(INSTALL) -m 755 glm$(EXE) $(DESTDIR)$(LIBEXECDIR)/glm$(EXE) + $(INSTALL) -m 755 olmoe$(EXE) $(DESTDIR)$(LIBEXECDIR)/olmoe$(EXE) + $(INSTALL) -m 644 resource_plan.py doctor.py openai_server.py $(DESTDIR)$(LIBEXECDIR)/ + $(INSTALL) -m 644 tools/*.py $(DESTDIR)$(LIBEXECDIR)/tools/ + +uninstall: + rm -f $(DESTDIR)$(BINDIR)/coli + rm -rf $(DESTDIR)$(LIBEXECDIR) + clean: $(PYTHON) tools/clean.py -.PHONY: all glm cuda-test cuda-bench cuda-dll portable test-c test-python test check clean +bench: iobench$(EXE) + @if [ -n "$(ARGS)" ]; then ./iobench$(EXE) $(ARGS); else echo "built iobench$(EXE) — run: ./iobench$(EXE) "; fi +.PHONY: all glm cuda-test cuda-bench cuda-dll portable test-c test-python test check clean install uninstall bench \ No newline at end of file diff --git a/c/coli b/c/coli index 7ff7812..c12852f 100755 --- a/c/coli +++ b/c/coli @@ -29,8 +29,31 @@ if sys.platform == "win32": except (AttributeError, OSError): pass HERE = os.path.dirname(os.path.abspath(__file__)) -TOOLS = os.path.join(HERE, "tools") -GLM = os.path.join(HERE, "glm" + (".exe" if sys.platform == "win32" else "")) + +# Run-in-place (source checkout, "cd c && ./coli ..."): the engine, the +# support modules (resource_plan.py, doctor.py, openai_server.py) and +# tools/ all live next to this script — unchanged from before. +# +# Installed layout ("make install"): this script is $(PREFIX)/bin/coli, +# while the engine binaries and support files live in +# $(PREFIX)/libexec/colibri, since they aren't meant to be run directly +# by users. COLI_ENGINE overrides the engine path explicitly if neither +# guess is right (e.g. a custom packaging layout). +_EXE = ".exe" if sys.platform == "win32" else "" +_LIBEXEC = os.path.join(os.path.dirname(HERE), "libexec", "colibri") +_here_glm = os.path.join(HERE, "glm" + _EXE) + +if os.environ.get("COLI_ENGINE"): + GLM = os.environ["COLI_ENGINE"] + TOOLS = os.path.join(os.path.dirname(GLM), "tools") +elif os.path.exists(_here_glm): + GLM = _here_glm + TOOLS = os.path.join(HERE, "tools") +else: + GLM = os.path.join(_LIBEXEC, "glm" + _EXE) + TOOLS = os.path.join(_LIBEXEC, "tools") + sys.path.insert(0, _LIBEXEC) # so `import resource_plan`, `doctor`, `openai_server` still resolve + DEF_MODEL = os.environ.get("COLI_MODEL", "/home/vincenzo/glm52_i4") END = b"\x01\x01END\x01\x01\n" READY = b"\x01\x01READY\x01\x01\n" @@ -302,6 +325,9 @@ def stream_turn(p, sentinel, on_bytes): # ---------- comandi ---------- def cmd_build(a): banner("build") + if not os.path.exists(os.path.join(HERE, "Makefile")): + sys.exit(f"{C.yel}coli build{C.r} only works from a source checkout (this is an installed copy).\n" + f" Clone https://github.com/JustVugg/colibri and run ./setup.sh, or make -C c glm.") sys.exit(subprocess.call(["make","-C",HERE,"glm"])) def cmd_info(a):