1. Breakfast Quay
  2. Untitled project
  3. RubberBand

Commits

Chris Cannam  committed 07a810b

Update ippInit call for newer IPP versions

  • Participants
  • Parent commits b745ccc
  • Branches bqlibs

Comments (0)

Files changed (2)

File Makefile.in Modified

View file
  • Ignore whitespace
  • Hide word diff
 PREFIX		:= @prefix@
 CXX		:= @CXX@
 CC		:= @CC@
-CXXFLAGS	:= -DHAVE_LIBSAMPLERATE -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS -DUSE_PTHREADS -DNO_TIMING -DNDEBUG -I. -Isrc -Isrc/bqvec -Isrc/bqvec/bqvec -Isrc/bqfft -Isrc/bqresample -Irubberband @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ $(OPTFLAGS)
+CXXFLAGS	:= -DHAVE_LIBSAMPLERATE -DHAVE_IPP -I/opt/intel/ipp/include -DNO_THREAD_CHECKS -DUSE_PTHREADS -DNO_TIMING -DNDEBUG -I. -Isrc -Isrc/bqvec -Isrc/bqvec/bqvec -Isrc/bqfft -Isrc/bqresample -Irubberband @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ $(OPTFLAGS)
 CFLAGS		:= @CFLAGS@ $(OPTFLAGS)
-LDFLAGS		:= @LDFLAGS@ -lpthread $(LDFLAGS)
+LDFLAGS		:= @LDFLAGS@ -lpthread $(LDFLAGS) -L/opt/intel/ipp/lib/intel64_lin -Wl,-Bstatic -lipps -lippvm -lippcore -Wl,-Bdynamic
 
 JNI_CXXFLAGS	:= -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 JAVAC		:= $(JAVA_HOME)/bin/javac

File src/system/sysutils.cpp Modified

View file
  • Ignore whitespace
  • Hide word diff
 #include <iostream>
 
 #ifdef HAVE_IPP
-#include <ipp.h> // for static init
+#include <ippversion.h>
+#include <ipp.h> // for init
 #endif
 
 #ifdef HAVE_VDSP
 void system_specific_initialise()
 {
 #if defined HAVE_IPP
+#if (IPP_VERSION_MAJOR >= 6)
+    ippInit();
+#else 
 #ifndef USE_IPP_DYNAMIC_LIBS
-//    std::cerr << "Calling ippStaticInit" << std::endl;
     ippStaticInit();
 #endif
+#endif
     ippSetDenormAreZeros(1);
 #elif defined HAVE_VDSP
 #if defined __i386__ || defined __x86_64__