Skip to content

Commit

Permalink
Release ZFP 0.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
salasoom committed Mar 28, 2018
2 parents 3677fc4 + 2aeef9d commit 87ff6e7
Show file tree
Hide file tree
Showing 24 changed files with 1,067 additions and 324 deletions.
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ matrix:
- os: linux
dist: trusty
compiler: clang
before_install:
- export LD_LIBRARY_PATH=/usr/local/clang/lib:$LD_LIBRARY_PATH
addons:
apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty']
Expand Down Expand Up @@ -118,6 +120,14 @@ matrix:
osx_image: xcode8.3
compiler: gcc

- os: osx
osx_image: xcode7.3
compiler: clang

- os: osx
osx_image: xcode8.3
compiler: clang

script:
- ./travis.sh

17 changes: 14 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,18 @@ if(ZFP_ENABLE_PIC)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()

# Compile-time options.

set(ZFP_BIT_STREAM_WORD_SIZE 64 CACHE STRING
"Use smaller bit stream word type for finer rate granularity")
set_property(CACHE ZFP_BIT_STREAM_WORD_SIZE PROPERTY STRINGS "8;16;32;64")

option(ZFP_WITH_OPENMP "Enable OpenMP parallel compression" ON)

option(ZFP_WITH_BIT_STREAM_STRIDED
"Enable strided access for progressive zfp streams" OFF)

option(ZFP_WITH_ALIGNED_ALLOC "Enabled aligned memory allocation" OFF)
option(ZFP_WITH_ALIGNED_ALLOC "Enable aligned memory allocation" OFF)

option(ZFP_WITH_CACHE_TWOWAY "Use two-way skew-associative cache" OFF)

Expand All @@ -125,6 +129,15 @@ if((DEFINED ZFP_UINT64) AND (DEFINED ZFP_UINT64_SUFFIX))
list(APPEND zfp_defs ZFP_UINT64_SUFFIX=${ZFP_UINT64_SUFFIX})
endif()

if(ZFP_WITH_OPENMP)
find_package(OpenMP)
if(OPENMP_FOUND)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
endif()
endif()

if(NOT (ZFP_BIT_STREAM_WORD_SIZE EQUAL 64))
list(APPEND zfp_defs BIT_STREAM_WORD_TYPE=uint${ZFP_BIT_STREAM_WORD_SIZE})
endif()
Expand Down Expand Up @@ -173,14 +186,12 @@ endif()
#------------------------------------------------------------------------------#
# Header install
#------------------------------------------------------------------------------#

install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install(DIRECTORY array/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

#------------------------------------------------------------------------------#
# Build type: one of None, Debug, Release, RelWithDebInfo, MinSizeRel
#------------------------------------------------------------------------------#

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Type of CMake build" FORCE)
endif()
39 changes: 33 additions & 6 deletions Config
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
# default compiler settings ---------------------------------------------------
# compiler executables --------------------------------------------------------

CC = gcc
CXX = g++
FLAGS = -O3 -fPIC -Wall -pedantic -I../include $(DEFS)
# CFLAGS = -std=c89 -Wno-unused-function $(FLAGS)
CFLAGS = -std=c99 $(FLAGS)
CXXFLAGS = -std=c++98 $(FLAGS)
# CXXFLAGS = -std=c++11 $(FLAGS)

# language standard -----------------------------------------------------------

# CSTD = -std=c89 -Wno-unused-function
CSTD = -std=c99
CXXSTD = -std=c++98
# CXXSTD = -std=c++11

# common compiler options -----------------------------------------------------

FLAGS = -O3 -fPIC -Wall -pedantic -I../include

# OpenMP compiler options -----------------------------------------------------

# do not uncomment; use "make ZFP_WITH_OPENMP=0" to disable OpenMP
OMPFLAGS = -fopenmp

# optional compiler macros ----------------------------------------------------

Expand Down Expand Up @@ -34,3 +45,19 @@ CXXFLAGS = -std=c++98 $(FLAGS)

# count cache misses
# DEFS += -DZFP_WITH_CACHE_PROFILE

# conditionals ----------------------------------------------------------------

# enable OpenMP?
ifdef ZFP_WITH_OPENMP
ifneq ($(ZFP_WITH_OPENMP),0)
ifneq ($(ZFP_WITH_OPENMP),OFF)
FLAGS += $(OMPFLAGS)
endif
endif
endif

# compiler options ------------------------------------------------------------

CFLAGS = $(CSTD) $(FLAGS) $(DEFS)
CXXFLAGS = $(CXXSTD) $(FLAGS) $(DEFS)
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Copyright (c) 2014-2017, Lawrence Livermore National Security, LLC.
Copyright (c) 2014-2018, Lawrence Livermore National Security, LLC.
Produced at the Lawrence Livermore National Laboratory.
Written by Peter Lindstrom.
Written by Peter Lindstrom and Markus Salasoo.
LLNL-CODE-663824.
All rights reserved.

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ DOCUMENTATION
-------------

Full
[documentation](http://zfp.readthedocs.io/en/release0.5.2/)
[documentation](http://zfp.readthedocs.io/en/release0.5.3/)
is available online via Read the Docs. A
[PDF](http://readthedocs.org/projects/zfp/downloads/pdf/release0.5.2/)
[PDF](http://readthedocs.org/projects/zfp/downloads/pdf/release0.5.3/)
version is also available.


Expand Down
233 changes: 0 additions & 233 deletions VERSIONS

This file was deleted.

Loading

0 comments on commit 87ff6e7

Please sign in to comment.