From f4b4430380d0f1765cbbe4e4272b4148f3a7fc7a Mon Sep 17 00:00:00 2001 From: kennyfrc Date: Sat, 12 Dec 2020 23:39:42 +0800 Subject: [PATCH] remove unnecessary makefile commands and fix blas on mac --- README.md | 4 ++-- src/Makefile | 33 +++++---------------------------- 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 99168e3f..fe6ce27c 100644 --- a/README.md +++ b/README.md @@ -44,12 +44,12 @@ brew install openblas 2. Go to src then build using the makefile ``` cd src -make learn ARCH=x86-64 COMP=gcc +make build ARCH=x86-64 COMP=gcc blas=yes ``` or ``` cd src -make profile-learn ARCH=x86-64 COMP=gcc +make profile-build ARCH=x86-64 COMP=gcc blas=yes ``` ## Training Guide diff --git a/src/Makefile b/src/Makefile index 5ec747a7..1ae9cd5f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -403,8 +403,8 @@ ifeq ($(COMP),clang) endif ifeq ($(KERNEL),Darwin) - CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.14 - LDFLAGS += -arch $(arch) -mmacosx-version-min=10.14 + CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.15 + LDFLAGS += -arch $(arch) -mmacosx-version-min=10.15 XCRUN = xcrun endif @@ -477,6 +477,9 @@ ifeq ($(blas), yes) ifeq ($(KERNEL),Linux) LDFLAGS += + else ifeq ($(KERNEL), Darwin) + CXXFLAGS += -I/usr/local/opt/openblas/include + LDFLAGS += -L/usr/local/opt/openblas/lib -lcblas else CXXFLAGS += -I/mingw64/include/OpenBLAS @@ -920,32 +923,6 @@ icc-profile-use: EXTRACXXFLAGS='-prof_use -prof_dir ./profdir' \ all -learn: config-sanity - $(MAKE) ARCH=$(ARCH) COMP=$(COMP) \ - EXTRACXXFLAGS=' -DEVAL_LEARN -DEVAL_NNUE -DENABLE_TEST_CMD -DUSE_BLAS -I/usr/local/opt/openblas/include' \ - EXTRALDFLAGS=' -L/usr/local/opt/openblas/lib -Wl,-s -lcblas' \ - all - -profile-learn: config-sanity objclean profileclean - @echo "" - @echo "Step 1/4. Building instrumented executable ..." - $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_make) \ - LEARNCXXFLAGS=' -DEVAL_LEARN -DEVAL_NNUE -DENABLE_TEST_CMD -DUSE_BLAS -I/usr/local/opt/openblas/include' \ - LEARNLDFLAGS=' -L/usr/local/opt/openblas/lib -Wl,-s -lcblas' - @echo "" - @echo "Step 2/4. Running benchmark for pgo-build ..." - $(PGOGENSFEN) - @echo "" - @echo "Step 3/4. Building optimized executable ..." - $(MAKE) ARCH=$(ARCH) COMP=$(COMP) objclean - $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_use) \ - LEARNCXXFLAGS=' -DEVAL_LEARN -DEVAL_NNUE -DENABLE_TEST_CMD -DUSE_BLAS -I/usr/local/opt/openblas/include' \ - LEARNLDFLAGS=' -L/usr/local/opt/openblas/lib -Wl,-s -lcblas' - @echo "" - @echo "Step 4/4. Deleting profile data ..." - $(MAKE) ARCH=$(ARCH) COMP=$(COMP) profileclean - rm generated_kifu.bin - .depend: -@$(CXX) $(DEPENDFLAGS) -MM $(SRCS) > $@