Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Aparapi Native
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Aparapi
Aparapi Native
Commits
1a6ea784
Unverified
Commit
1a6ea784
authored
7 years ago
by
Jeffrey Phillips Freeman
Browse files
Options
Downloads
Patches
Plain Diff
Modified the scrips so the same scripts work on Linux and OSX and maybe windows.
parent
ea84067b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
Makefile.am
+2
-2
2 additions, 2 deletions
Makefile.am
README.md
+1
-1
1 addition, 1 deletion
README.md
configure.ac
+14
-1
14 additions, 1 deletion
configure.ac
with
18 additions
and
4 deletions
CHANGELOG.md
+
1
−
0
View file @
1a6ea784
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
## 1.2.1
## 1.2.1
*
createProgram in Java had the wrong signature producing a unsatisfied link exception that is now fixed.
*
createProgram in Java had the wrong signature producing a unsatisfied link exception that is now fixed.
*
The same scripts can now compile for Linux and OSX and potentially even windows.
## 1.2.0
## 1.2.0
...
...
This diff is collapsed.
Click to expand it.
Makefile.am
+
2
−
2
View file @
1a6ea784
AUTOMAKE_OPTIONS
=
foreign
AUTOMAKE_OPTIONS
=
foreign
EXTRA_DIST
=
include src/cpp/CLHelper.h src/cpp/classtools.h src/cpp/invoke/JavaArgs.h src/cpp/invoke/OpenCLMem.h src/cpp/invoke/OpenCLKernel.h src/cpp/invoke/OpenCLJNI.h src/cpp/invoke/OpenCLArgDescriptor.h src/cpp/invoke/OpenCLProgram.h src/cpp/CLException.h src/cpp/JNIHelper.h src/cpp/Common.h src/cpp/runKernel/KernelArg.h src/cpp/runKernel/Range.h src/cpp/runKernel/ProfileInfo.h src/cpp/runKernel/AparapiBuffer.h src/cpp/runKernel/Config.h src/cpp/runKernel/Aparapi.h src/cpp/runKernel/ArrayBuffer.h src/cpp/runKernel/JNIContext.h src/cpp/runKernel/List.h
EXTRA_DIST
=
include src/cpp/CLHelper.h src/cpp/classtools.h src/cpp/invoke/JavaArgs.h src/cpp/invoke/OpenCLMem.h src/cpp/invoke/OpenCLKernel.h src/cpp/invoke/OpenCLJNI.h src/cpp/invoke/OpenCLArgDescriptor.h src/cpp/invoke/OpenCLProgram.h src/cpp/CLException.h src/cpp/JNIHelper.h src/cpp/Common.h src/cpp/runKernel/KernelArg.h src/cpp/runKernel/Range.h src/cpp/runKernel/ProfileInfo.h src/cpp/runKernel/AparapiBuffer.h src/cpp/runKernel/Config.h src/cpp/runKernel/Aparapi.h src/cpp/runKernel/ArrayBuffer.h src/cpp/runKernel/JNIContext.h src/cpp/runKernel/List.h
lib_LTLIBRARIES
=
libaparapi.la
lib_LTLIBRARIES
=
libaparapi.la
libaparapi_la_
LD
FLAGS
=
-
lOpenCL
-version-info
3:1:2
libaparapi_la_
CPP
FLAGS
=
-
Iinclude
-I
/opt/AMDAPP/SDK/include
-Isrc
/cpp
-Isrc
/cpp/runKernel
-Isrc
/cpp/invoke
-I
/usr/lib/jvm/java-8-openjdk/include
-I
/usr/lib/jvm/java-8-openjdk/include/linux
-I
/usr/lib/jvm/java-8-openjdk-amd64/include
-I
/usr/lib/jvm/java-8-openjdk-amd64/include/linux
-I
/usr/lib/jvm/java-8-oracle/include
-I
/usr/lib/jvm/java-8-oracle/include/linux
-I
/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/
-DCL_USE_DEPRECATED_OPENCL_1_1_APIS
-fpermissive
libaparapi_la_
CPP
FLAGS
=
-Iinclude
-I
/opt/AMDAPP/SDK/include
-Isrc
/cpp
-Isrc
/cpp/runKernel
-Isrc
/cpp/invoke
-I
/usr/lib/jvm/java-8-openjdk/include
-I
/usr/lib/jvm/java-8-openjdk/include/linux
-I
/usr/lib/jvm/java-8-openjdk-amd64/include
-I
/usr/lib/jvm/java-8-openjdk-amd64/include/linux
-I
/usr/lib/jvm/java-8-oracle/include
-I
/usr/lib/jvm/java-8-oracle/include/linux
-DCL_USE_DEPRECATED_OPENCL_1_1_APIS
libaparapi_la_
LD
FLAGS
=
$(
LDFLAGS
)
libaparapi_la_SOURCES
=
src/cpp/runKernel/Aparapi.cpp src/cpp/runKernel/ArrayBuffer.cpp src/cpp/runKernel/AparapiBuffer.cpp src/cpp/runKernel/Config.cpp src/cpp/runKernel/JNIContext.cpp src/cpp/runKernel/KernelArg.cpp src/cpp/runKernel/ProfileInfo.cpp src/cpp/runKernel/Range.cpp src/cpp/invoke/OpenCLJNI.cpp src/cpp/invoke/OpenCLArgDescriptor.cpp src/cpp/invoke/OpenCLMem.cpp src/cpp/CLHelper.cpp src/cpp/classtools.cpp src/cpp/JNIHelper.cpp src/cpp/agent.cpp
libaparapi_la_SOURCES
=
src/cpp/runKernel/Aparapi.cpp src/cpp/runKernel/ArrayBuffer.cpp src/cpp/runKernel/AparapiBuffer.cpp src/cpp/runKernel/Config.cpp src/cpp/runKernel/JNIContext.cpp src/cpp/runKernel/KernelArg.cpp src/cpp/runKernel/ProfileInfo.cpp src/cpp/runKernel/Range.cpp src/cpp/invoke/OpenCLJNI.cpp src/cpp/invoke/OpenCLArgDescriptor.cpp src/cpp/invoke/OpenCLMem.cpp src/cpp/CLHelper.cpp src/cpp/classtools.cpp src/cpp/JNIHelper.cpp src/cpp/agent.cpp
all-local
:
all-local
:
This diff is collapsed.
Click to expand it.
README.md
+
1
−
1
View file @
1a6ea784
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
git submodule init
git submodule init
git submodule update
git submodule update
./prepare.sh
./prepare.sh
libtoolize
libtoolize
(or sometimes glibtoolize on osx)
aclocal
aclocal
autoconf
autoconf
automake --add-missing
automake --add-missing
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
14
−
1
View file @
1a6ea784
...
@@ -2,7 +2,20 @@ AC_INIT([libaparapi], [1.2.1], [syncleus@syncleus.com])
...
@@ -2,7 +2,20 @@ AC_INIT([libaparapi], [1.2.1], [syncleus@syncleus.com])
AC_ENABLE_SHARED(yes)
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
AC_ENABLE_STATIC(no)
LT_INIT
LT_INIT
AM_INIT_AUTOMAKE([subdir-objects])
AM_INIT_AUTOMAKE([
foreign
subdir-objects])
AC_PROG_CXX
AC_PROG_CXX
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
AC_OUTPUT
AC_CANONICAL_HOST
case $host_os in
darwin* )
LDFLAGS="-framework OpenCL -version-info 3:1:2"
;;
mingw*)
LDFLAGS="-no-undefined -lOpenCL -version-info 3:1:2"
;;
*)
LDFLAGS="-lOpenCL -version-info 3:1:2"
;;
esac
AC_SUBST([LDFLAGS])
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment