summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Merinov <n.merinov@samsung.com>2019-02-01 15:15:40 (GMT)
committerNikolai Merinov <n.merinov@samsung.com>2019-02-11 06:19:07 (GMT)
commite23009d9e070a77c076f00f22af8aaa1563dd852 (patch)
tree5ac966f3d0151d4b64639822f25e32ac27db084c
parent81765143316b542fc8b11989ac2d08645dae977e (diff)
downloadopenblas-sandbox/nmerinov/llvm.zip
openblas-sandbox/nmerinov/llvm.tar.gz
openblas-sandbox/nmerinov/llvm.tar.bz2
Install libomp dependency; Use libomp instead of libgompsandbox/nmerinov/llvm
-rw-r--r--Makefile.x862
-rw-r--r--Makefile.x86_642
-rw-r--r--benchmark/Makefile4
-rw-r--r--ctest/Makefile2
-rw-r--r--exports/Makefile2
-rw-r--r--packaging/openblas.spec1
-rw-r--r--test/Makefile2
7 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.x86 b/Makefile.x86
index a6196d3..11fe4bc 100644
--- a/Makefile.x86
+++ b/Makefile.x86
@@ -29,7 +29,7 @@ ifeq ($(F_COMPILER), GFORTRAN)
ifndef SMP
LIBACML = -L$(ACMLPATH)/gfortran32/lib -Wl,-rpath,$(ACMLPATH)/gfortran32/lib -lacml -lgfortran -lm
else
-LIBACML = -L$(ACMLPATH)/gfortran32_mp/lib -Wl,-rpath,$(ACMLPATH)/gfortran32_mp/lib -lacml_mp -lgfortran -lgomp -lm
+LIBACML = -L$(ACMLPATH)/gfortran32_mp/lib -Wl,-rpath,$(ACMLPATH)/gfortran32_mp/lib -lacml_mp -lgfortran -lomp -lm
endif
endif
diff --git a/Makefile.x86_64 b/Makefile.x86_64
index 1ba6327..9c5da67 100644
--- a/Makefile.x86_64
+++ b/Makefile.x86_64
@@ -44,7 +44,7 @@ ifeq ($(F_COMPILER), GFORTRAN)
ifndef SMP
LIBACML = -L$(ACMLPATH)/gfortran64/lib -Wl,-rpath,$(ACMLPATH)/gfortran64/lib -lacml -lacml_mv -lgfortran -lm
else
-LIBACML = -L$(ACMLPATH)/gfortran64_mp/lib -Wl,-rpath,$(ACMLPATH)/gfortran64_mp/lib -lacml_mp -lacml_mv -lgfortran -lgomp -lm
+LIBACML = -L$(ACMLPATH)/gfortran64_mp/lib -Wl,-rpath,$(ACMLPATH)/gfortran64_mp/lib -lacml_mp -lacml_mv -lgfortran -lomp -lm
endif
endif
diff --git a/benchmark/Makefile b/benchmark/Makefile
index 51e9c64..deba144 100644
--- a/benchmark/Makefile
+++ b/benchmark/Makefile
@@ -24,11 +24,11 @@ LIBATLAS = -fopenmp $(ATLAS)/liblapack.a $(ATLAS)/libptcblas.a $(ATLAS)/libptf
# Intel standard
# MKL=/opt/intel/mkl/lib/intel64
-# LIBMKL = -L$(MKL) -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm
+# LIBMKL = -L$(MKL) -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lomp -lpthread -lm
# Intel custom
MKL=/home/saar/intel_mkl
-LIBMKL = -L$(MKL) -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm
+LIBMKL = -L$(MKL) -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lomp -lpthread -lm
# Apple vecLib
LIBVECLIB = -framework Accelerate
diff --git a/ctest/Makefile b/ctest/Makefile
index 6eda438..3758d75 100644
--- a/ctest/Makefile
+++ b/ctest/Makefile
@@ -102,7 +102,7 @@ clean ::
rm -f x*
FLDFLAGS = $(FFLAGS:-fPIC=) $(LDFLAGS)
-CEXTRALIB =
+CEXTRALIB = -lomp
# Single real
xscblat1: $(stestl1o) c_sblat1.o $(TOPDIR)/$(LIBNAME)
diff --git a/exports/Makefile b/exports/Makefile
index c053895..b03ad23 100644
--- a/exports/Makefile
+++ b/exports/Makefile
@@ -38,7 +38,7 @@ endif
endif
ifeq ($(USE_OPENMP), 1)
ifeq ($(C_COMPILER), GCC)
-EXTRALIB += -lgomp
+EXTRALIB += -lomp
endif
endif
endif
diff --git a/packaging/openblas.spec b/packaging/openblas.spec
index a69e2fb..95b2a6a 100644
--- a/packaging/openblas.spec
+++ b/packaging/openblas.spec
@@ -17,6 +17,7 @@ BuildRequires: gcc-accel-aarch64-cross-aarch64
BuildRequires: gcc-accel-aarch64-cross-aarch64
%endif
BuildRequires: gcc-fortran libgfortran
+BuildRequires: libomp
BuildRequires: update-alternatives
BuildRequires: sed
Requires(post): update-alternatives
diff --git a/test/Makefile b/test/Makefile
index 65fb6f4..a14ee70 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -122,7 +122,7 @@ endif
FLDFLAGS = $(FFLAGS:-fPIC=) $(LDFLAGS)
-CEXTRALIB =
+CEXTRALIB = -lomp
sblat1 : sblat1.$(SUFFIX) ../$(LIBNAME)