Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
zholos committed Jul 25, 2017
2 parents 0390ceb + 544c60c commit 6015c85
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 12 deletions.
4 changes: 4 additions & 0 deletions CHANGES.txt
@@ -1,3 +1,7 @@
Version 0.7.3 on 2017-07-25:
* Updated k.h download location.
* Updated to OpenBLAS 0.2.20.

Version 0.7.2 on 2017-04-27:
* Updated k.h download location.

Expand Down
2 changes: 1 addition & 1 deletion mk/pkg.mk
Expand Up @@ -3,7 +3,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))common.mk
all: build

NETLIB_DIR = http://www.netlib.org
Q_DIR = https://raw.githubusercontent.com/KxSystems/code.archive/master/kx/kdb+
Q_DIR = https://raw.githubusercontent.com/KxSystems/kdb/f4fb81b7dc7448c73d94ae9dff0610fd71c7fe93
GITHUB_DIR = https://github.com/$(1)/$(2)/archive/$(3)

.PRECIOUS: ../download/%.part
Expand Down
2 changes: 1 addition & 1 deletion mk/src.mk
@@ -1,6 +1,6 @@
include $(dir $(lastword $(MAKEFILE_LIST)))common.mk

VERSION := 0.7.2
VERSION := 0.7.3

OBJS := const.o alloc.o util.o opt.o \
libm.o cephes.o lapack.o conmin.o conmax.o nlopt.o
Expand Down
10 changes: 5 additions & 5 deletions openblas/Makefile
@@ -1,14 +1,14 @@
include ../mk/pkg.mk

openblas-0.2.19.tgz.url = $(call GITHUB_DIR,xianyi,OpenBLAS,v0.2.19.tar.gz)
openblas-0.2.19.tgz.sha256 = \
9c40b5e4970f27c5f6911cb0a28aa26b6c83f17418b69f8e5a116bb983ca8557
openblas-0.2.20.tgz.url = $(call GITHUB_DIR,xianyi,OpenBLAS,v0.2.20.tar.gz)
openblas-0.2.20.tgz.sha256 = \
5ef38b15d9c652985774869efd548b8e3e972e1e99475c673b25537ed7bcf394

ifneq ($(BUILD_OPENBLAS),)

do_extract: ../download/openblas-0.2.19.tgz
do_extract: ../download/openblas-0.2.20.tgz
tar xzf $<
ln -sf OpenBLAS-0.2.19 work
ln -sf OpenBLAS-0.2.20 work

# For static architecture we can skip single-precision and complex routines to
# reduce build time. For dynamic architecture all the routines are in a single
Expand Down
2 changes: 1 addition & 1 deletion openblas/buffers.patch
@@ -1,6 +1,6 @@
--- driver/others/memory.c
+++ driver/others/memory.c
@@ -1145,7 +1145,7 @@
@@ -1187,7 +1187,7 @@
error:
printf("BLAS : Program is Terminated. Because you tried to allocate too many memory regions.\n");

Expand Down
8 changes: 4 additions & 4 deletions openblas/make.patch
Expand Up @@ -3,7 +3,7 @@ but still build OpenBLAS custom implementations of LAPACK routines.

--- Makefile
+++ Makefile
@@ -201,7 +201,7 @@
@@ -206,7 +206,7 @@
fi; \
done

Expand All @@ -28,15 +28,15 @@ On MinGW ln just copies the file, so do that after the file has been created.

--- Makefile
+++ Makefile
@@ -130,7 +130,6 @@
@@ -135,7 +135,6 @@
$(error OpenBLAS: neither static nor shared are enabled.)
endif
endif
- @-ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
@for d in $(SUBDIRS) ; \
do if test -d $$d; then \
$(MAKE) -C $$d $(@F) || exit 1 ; \
@@ -156,6 +155,7 @@
@@ -161,6 +160,7 @@
ifdef USE_THREAD
@echo USE_THREAD=$(USE_THREAD) >> Makefile.conf_last
endif
Expand All @@ -52,7 +52,7 @@ override it.

--- Makefile.system
+++ Makefile.system
@@ -195,6 +195,8 @@
@@ -201,6 +201,8 @@
NEED_PIC = 1
endif

Expand Down
3 changes: 3 additions & 0 deletions q/Makefile
@@ -1,8 +1,11 @@
include ../mk/pkg.mk

k.h.url = $(Q_DIR)/c/c/k.h
k.h.sha256 = cbf96d056492f0d26f84510497b08a6bedb612c131031b4605bedf99f4f7db8d

$(KXARCH)/q.lib.url = $(Q_DIR)/$(KXARCH)/q.lib
w32/q.lib.sha256 = 05520dab4079d379f18b0f0a8d2c27383975b050dc316ccee1f6c9c67892de81
w64/q.lib.sha256 = 98907c494b982fef150bd0c42775c38bad3ffd435b8001bd30cff0c22280df7d

Q_LIB=$(if $(WINDOWS),../download/$(KXARCH)/q.lib,)

Expand Down

0 comments on commit 6015c85

Please sign in to comment.