Skip to content

Commit 20eeb07

Browse files
cmaginaclaude
andcommitted
refactor: modernize Makefile build system for new architecture
Update both the root Makefile and .devcontainer/Makefile to support the new modular architecture: Root Makefile changes: - Restructure with clear sections (system, buildtime, versions, naming, runtime) - Add new image naming: base, cpu, cuda, rocm (replacing old triton-* names) - Add comprehensive runtime configuration options for all frameworks - Add support for INSTALL_* variables for modular framework setup - Add new build targets for base, cpu, cuda, rocm images - Add new run targets for all framework/variant combinations - Improve documentation and organization .devcontainer/Makefile changes: - Update VARIANTS to use new naming: cpu, cuda, rocm - Update clean targets for new generated file names Benefits: - Clearer organization with well-defined sections - Support for new modular setup scripts - More flexible runtime configuration - Better naming that reflects actual hardware support - Improved maintainability This modernization integrates with the new Dockerfiles from PR redhat-et#121 and leverages the modular scripts from PRs redhat-et#115-120. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent 0a65511 commit 20eeb07

File tree

2 files changed

+322
-137
lines changed

2 files changed

+322
-137
lines changed

.devcontainer/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VARIANTS := triton triton-cpu triton-amd
1+
VARIANTS := cpu cuda rocm
22
BASE_DIR := $(CURDIR)
33

44
##@ Devcontainer
@@ -20,12 +20,12 @@ list: ## List all variants
2020

2121
clean: ## Remove all generated devcontainer.json files
2222
@for v in $(VARIANTS); do \
23-
echo "Removing $$v/devcontainer.json"; \
24-
rm -f $(BASE_DIR)/$$v/devcontainer.json; \
25-
echo "Removing $$v/user.sh"; \
26-
rm -f $(BASE_DIR)/$$v/user.sh; \
27-
echo "Removing $$v/postStartCommand.sh"; \
28-
rm -f $(BASE_DIR)/$$v/postStartCommand.sh; \
23+
echo "Removing $$v/devcontainer.json"; \
24+
rm -f $(BASE_DIR)/$$v/devcontainer.json; \
25+
echo "Removing $$v/create_user.sh"; \
26+
rm -f $(BASE_DIR)/$$v/create_user.sh; \
27+
echo "Removing $$v/postStartCommand.sh"; \
28+
rm -f $(BASE_DIR)/$$v/postStartCommand.sh; \
2929
done
3030

3131
help: ## Show this help message

0 commit comments

Comments
 (0)