UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-04-23 07:34:23 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #333 from elezar/test-on-darwin

Browse Source 
Fix build and tests targets on darwin
This commit is contained in:
Evan Lezar 2024-02-06 10:16:04 +01:00 committed by GitHub
commit f0545dd979
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -53,22 +53,26 @@ CLI_VERSION = $(VERSION)
endif endif
CLI_VERSION_PACKAGE = github.com/NVIDIA/nvidia-container-toolkit/internal/info CLI_VERSION_PACKAGE = github.com/NVIDIA/nvidia-container-toolkit/internal/info
GOOS ?= linux
binaries: cmds binaries: cmds
ifneq ($(PREFIX),) ifneq ($(PREFIX),)
cmd-%: COMMAND_BUILD_OPTIONS = -o $(PREFIX)/$(*) cmd-%: COMMAND_BUILD_OPTIONS = -o $(PREFIX)/$(*)
endif endif
cmds: $(CMD_TARGETS) cmds: $(CMD_TARGETS)
ifneq ($(shell uname),Darwin)
EXTLDFLAGS = -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files
else
EXTLDFLAGS = -Wl,-undefined,dynamic_lookup
endif
$(CMD_TARGETS): cmd-%: $(CMD_TARGETS): cmd-%:
GOOS=$(GOOS) go build -ldflags "-extldflags=-Wl,-z,lazy -s -w -X $(CLI_VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) -X $(CLI_VERSION_PACKAGE).version=$(CLI_VERSION)" $(COMMAND_BUILD_OPTIONS) $(MODULE)/cmd/$(*) go build -ldflags "-s -w '-extldflags=$(EXTLDFLAGS)' -X $(CLI_VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) -X $(CLI_VERSION_PACKAGE).version=$(CLI_VERSION)" $(COMMAND_BUILD_OPTIONS) $(MODULE)/cmd/$(*)
build: build:
GOOS=$(GOOS) go build ./... go build ./...
examples: $(EXAMPLE_TARGETS) examples: $(EXAMPLE_TARGETS)
$(EXAMPLE_TARGETS): example-%: $(EXAMPLE_TARGETS): example-%:
GOOS=$(GOOS) go build ./examples/$(*) go build ./examples/$(*)
all: check test build binary all: check test build binary
check: $(CHECK_TARGETS) check: $(CHECK_TARGETS)
@ -100,7 +104,7 @@ coverage: test
generate: generate:
go generate $(MODULE)/... go generate $(MODULE)/...
$(DOCKER_TARGETS): docker-%: $(DOCKER_TARGETS): docker-%:
@echo "Running 'make $(*)' in container image $(BUILDIMAGE)" @echo "Running 'make $(*)' in container image $(BUILDIMAGE)"
$(DOCKER) run \ $(DOCKER) run \
--rm \ --rm \

3
internal/cuda/cuda.go
View File

@ -23,7 +23,8 @@ import (
) )
/* /*
#cgo LDFLAGS: -Wl,--unresolved-symbols=ignore-in-object-files #cgo linux LDFLAGS: -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files
#cgo darwin LDFLAGS: -Wl,-undefined,dynamic_lookup
#ifdef _WIN32 #ifdef _WIN32
#define CUDAAPI __stdcall #define CUDAAPI __stdcall

4
internal/dxcore/dxcore.go
View File

@ -17,7 +17,9 @@
package dxcore package dxcore
/* /*
#cgo LDFLAGS: -Wl,--unresolved-symbols=ignore-in-object-files #cgo linux LDFLAGS: -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files
#cgo darwin LDFLAGS: -Wl,-undefined,dynamic_lookup
#include <dxcore.h> #include <dxcore.h>
*/ */
import "C" import "C"