Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumping to Java 11 #130

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Bumping to Java 11 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7a147c
Bumped to Java 11, removed ant script
mikiobraun Apr 30, 2021
fc462b0
Also added rjpp scripts
mikiobraun Apr 30, 2021
396c711
Fixed properties to not override testing
mikiobraun Apr 30, 2021
d9c91e8
Forgot to add these files.
mikiobraun Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 60 additions & 68 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ SRC_JAVA=$(SRC)/java
SRC_C=$(SRC)/c
RESOURCES=$(SRC)/resources

JAVAC=javac

TARGET_C=target/c

LIB_PATH=$(RESOURCES)/lib/$(LINKAGE_TYPE)/$(OS_NAME)/$(OS_ARCH)
Expand Down Expand Up @@ -92,28 +94,39 @@ SHARED_LIBS=$(FULL_LIB_PATH)/$(LIB)jblas.$(SO) $(LIB_PATH)/$(LIB)jblas_arch_flav
# The default target
all : $(SHARED_LIBS)

# Generate the code for the wrapper (both Java and C)
generate-wrapper: $(GENERATED_SOURCES) $(GENERATED_HEADERS)
#
# main library jblas (from NativeBlas)
#
$(FULL_LIB_PATH)/$(LIB)jblas.$(SO) : $(TARGET_C)/NativeBlas.$(SO)
@mkdir -p "$(dir $@)"
mv "$<" "$@"

$(TARGET_C)/NativeBlas.o: $(SRC_C)/NativeBlas.c
@mkdir -p "$(dir $@)"
$(CC) $(CFLAGS) $(INCDIRS) -c $(SRC_C)/NativeBlas.c -o $@

# Clean all object files
clean:
rm -f native/*.o native/*.$(SO) \
$(LIB_PATH)/$(LIB)jblas.$(SO) $(LIB_PATH)/$(LIB)jblas_arch_flavor.$(SO) \
$(FULL_LIB_PATH)/$(LIB)jblas.$(SO) $(FULL_LIB_PATH)/$(LIB)jblas_arch_flavor.$(SO) \
$(SRC_JAVA)/$(PACKAGE_PATH)/NativeBlas.java $(SRC_C)/NativeBlas.c generated-sources
$(SRC_C)/NativeBlas.c: generated-sources


#
# Arch Flavor
#
$(LIB_PATH)/$(LIB)jblas_arch_flavor.$(SO): $(SRC_C)/jblas_arch_flavor.$(SO)
@mkdir -p "$(dir $@)"
mv "$<" "$@"

$(TARGET_C)/jblas_arch_flavor.o: generated-sources
@mkdir -p "$(dir $@)"
$(CC) $(CFLAGS) $(INCDIRS) -c $(SRC_C)/jblas_arch_flavor.c -o $@


#
# Generating JNI files and headers
#

# Generate the code for the wrapper (both Java and C)
generate-wrapper: $(GENERATED_SOURCES) $(GENERATED_HEADERS)

# Full clean, including information extracted from the fortranwrappers.
# You will need the original fortran sources in order to rebuild
# the wrappers.
ifeq ($(LAPACK_HOME),)
realclean: clean
@echo "Since you don't have LAPACK sources, I cannot rebuild stubs and deleting the cached information is not a good idea."
@echo "(nothing deleted)"
else
realclean: clean
rm -f fortranwrapper.dump
endif

# Generating the stubs. This target requires that the blas sources can
# be found in the $(BLAS) and $(LAPACK) directories.
Expand Down Expand Up @@ -149,27 +162,36 @@ generated-sources: \
$(LAPACK)/[sd]geqrf.f $(LAPACK)/[sd]ormqr.f \
$(LAPACK)/[sd]orgqr.f \
$(LAPACK)/[sd]sygvx.f
ant javah
$(JAVAC) -classpath $(SRC_JAVA) $(SRC_JAVA)/org/jblas/util/ArchFlavor.java -h $(SRC_C)
$(JAVAC) -classpath $(SRC_JAVA) $(SRC_JAVA)/org/jblas/NativeBlas.java -h $(SRC_C)
touch $@

$(SRC_C)/NativeBlas.c: generated-sources

$(TARGET_C)/NativeBlas.o: $(SRC_C)/NativeBlas.c
@mkdir -p "$(dir $@)"
$(CC) $(CFLAGS) $(INCDIRS) -c $(SRC_C)/NativeBlas.c -o $@
####################################################################################
#
# Cleaning
#

$(TARGET_C)/jblas_arch_flavor.o: generated-sources
@mkdir -p "$(dir $@)"
$(CC) $(CFLAGS) $(INCDIRS) -c $(SRC_C)/jblas_arch_flavor.c -o $@
# Clean all object files
clean:
rm -f native/*.o native/*.$(SO) \
$(LIB_PATH)/$(LIB)jblas.$(SO) $(LIB_PATH)/$(LIB)jblas_arch_flavor.$(SO) \
$(FULL_LIB_PATH)/$(LIB)jblas.$(SO) $(FULL_LIB_PATH)/$(LIB)jblas_arch_flavor.$(SO) \
$(SRC_JAVA)/$(PACKAGE_PATH)/NativeBlas.java $(SRC_C)/NativeBlas.c generated-sources

# Full clean, including information extracted from the fortranwrappers.
# You will need the original fortran sources in order to rebuild
# the wrappers.
ifeq ($(LAPACK_HOME),)
realclean: clean
@echo "Since you don't have LAPACK sources, I cannot rebuild stubs and deleting the cached information is not a good idea."
@echo "(nothing deleted)"
else
realclean: clean
rm -f fortranwrapper.dump
endif

# Move the compile library to the machine specific directory.
$(FULL_LIB_PATH)/$(LIB)jblas.$(SO) : $(TARGET_C)/NativeBlas.$(SO)
@mkdir -p "$(dir $@)"
mv "$<" "$@"

$(LIB_PATH)/$(LIB)jblas_arch_flavor.$(SO): $(SRC_C)/jblas_arch_flavor.$(SO)
@mkdir -p "$(dir $@)"
mv "$<" "$@"

######################################################################
#
Expand All @@ -188,40 +210,6 @@ test-dist:
tar xzvf jblas-$(VERSION).tgz
(cd jblas-$(VERSION); ./configure; make -j3; ant jar; LD_LIBRARY_PATH=$(FULL_LIB_PATH):$(LIB_PATH) java -cp jblas-$(VERSION).jar org.jblas.util.SanityChecks)

######################################################################
#
# Packaging
#


# Build different kind of jars:
#
# * with dynamic libraries
# * with static libraries
# * a "fat" jar with everything
#
# FIXME: I think this build target assumes that the current configuration
# is "dynamic"
all-jars:
ant clean-jars
./configure --keep-options $$(cat configure.options)
ant jar
ant lean-jar
./configure --keep-options --static-libs $$(cat configure.options)
make
ant static-jar fat-jar

# Build static jars
all-static-jars:
./configure --keep-options --static-libs $$(cat configure.options)
make
for os_name in native-libs/*; do \
for os_arch in $$os_name/* ; do \
ant static-jar -Dos_name=$$(basename $$os_name) \
-Dos_arch=$$(basename $$os_arch); \
done; \
done

################################################################################
#
# Docker development
Expand Down Expand Up @@ -256,6 +244,10 @@ test-ubuntu2004:
docker build -f docker/test-ubuntu2004.Dockerfile -t jblas/test-ubuntu2004 .
docker run --rm jblas/test-ubuntu2004 /bin/bash

shell-debian-testing:
docker build -f docker/dev-debian-testing.Dockerfile -t jblas/dev-debian-testing .
docker run -it --rm -v $(PWD):/home/dev jblas/dev-debian-testing /bin/bash


#----------------------------------------------------------
# aarch64 / arm64
Expand Down
Loading