Skip to content

Commit 0f0fafa

Browse files
authored
fix(stablediffusion): Avoid overwriting SYCL specific flags from outer make call (#5181)
Signed-off-by: Richard Palethorpe <[email protected]>
1 parent 4f239ba commit 0f0fafa

File tree

1 file changed

+7
-5
lines changed
  • backend/go/image/stablediffusion-ggml

1 file changed

+7
-5
lines changed

backend/go/image/stablediffusion-ggml/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ CXXFLAGS = -I. -I$(INCLUDE_PATH)/../../../../sources/stablediffusion-ggml.cpp/th
1010

1111
GOCMD?=go
1212
CGO_LDFLAGS?=
13+
# Avoid parent make file overwriting CGO_LDFLAGS which is needed for hipblas
14+
CGO_LDFLAGS_SYCL=
1315
GO_TAGS?=
1416
LD_FLAGS?=
1517

@@ -49,8 +51,8 @@ ifeq ($(BUILD_TYPE),sycl_f16)
4951
-DGGML_SYCL_F16=ON
5052
CC=icx
5153
CXX=icpx
52-
CGO_LDFLAGS += -fsycl -L${DNNLROOT}/lib -ldnnl ${MKLROOT}/lib/intel64/libmkl_sycl.a -fiopenmp -fopenmp-targets=spir64 -lOpenCL
53-
CGO_LDFLAGS += $(shell pkg-config --libs mkl-static-lp64-gomp)
54+
CGO_LDFLAGS_SYCL += -fsycl -L${DNNLROOT}/lib -ldnnl ${MKLROOT}/lib/intel64/libmkl_sycl.a -fiopenmp -fopenmp-targets=spir64 -lOpenCL
55+
CGO_LDFLAGS_SYCL += $(shell pkg-config --libs mkl-static-lp64-gomp)
5456
CGO_CXXFLAGS += -fiopenmp -fopenmp-targets=spir64
5557
CGO_CXXFLAGS += $(shell pkg-config --cflags mkl-static-lp64-gomp )
5658
endif
@@ -62,8 +64,8 @@ ifeq ($(BUILD_TYPE),sycl_f32)
6264
-DSD_SYCL=ON
6365
CC=icx
6466
CXX=icpx
65-
CGO_LDFLAGS += -fsycl -L${DNNLROOT}/lib -ldnnl ${MKLROOT}/lib/intel64/libmkl_sycl.a -fiopenmp -fopenmp-targets=spir64 -lOpenCL
66-
CGO_LDFLAGS += $(shell pkg-config --libs mkl-static-lp64-gomp)
67+
CGO_LDFLAGS_SYCL += -fsycl -L${DNNLROOT}/lib -ldnnl ${MKLROOT}/lib/intel64/libmkl_sycl.a -fiopenmp -fopenmp-targets=spir64 -lOpenCL
68+
CGO_LDFLAGS_SYCL += $(shell pkg-config --libs mkl-static-lp64-gomp)
6769
CGO_CXXFLAGS += -fiopenmp -fopenmp-targets=spir64
6870
CGO_CXXFLAGS += $(shell pkg-config --cflags mkl-static-lp64-gomp )
6971
endif
@@ -122,7 +124,7 @@ libsd.a: gosd.o
122124
$(AR) rcs libsd.a gosd.o
123125

124126
stablediffusion-ggml:
125-
CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH="$(INCLUDE_PATH)" LIBRARY_PATH="$(LIBRARY_PATH)" \
127+
CGO_LDFLAGS="$(CGO_LDFLAGS) $(CGO_LDFLAGS_SYCL)" C_INCLUDE_PATH="$(INCLUDE_PATH)" LIBRARY_PATH="$(LIBRARY_PATH)" \
126128
CC="$(CC)" CXX="$(CXX)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" \
127129
$(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o ../../../../backend-assets/grpc/stablediffusion-ggml ./
128130
ifneq ($(UPX),)

0 commit comments

Comments
 (0)