Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ SUBDIRS := src/smithlab_cpp
install installdirs: SUBDIRS := $(filter-out src/smithlab_cpp, $(SUBDIRS))
AM_CPPFLAGS = -I $(top_srcdir)/src/smithlab_cpp -I $(top_srcdir)/src/bamxx

AM_CXXFLAGS = $(OPENMP_CXXFLAGS)
AM_CXXFLAGS += -Wall -Wextra -Wpedantic -Wno-unknown-attributes
AM_CXXFLAGS = -Wall -Wextra -Wpedantic -Wno-unknown-attributes
if ENABLE_SHORT
AM_CXXFLAGS += -DENABLE_SHORT
endif
Expand Down
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@ See how to [get started](https://github.com/smithlabcode/abismal/blob/master/doc

### Requirements ###

Currently abismal requires a C++ compiler that supports the C++11
standard and OpenMP. The default compiler assumed is g++ (comes with
GCC, available on your Linux or macOS machine). The g++ compiler has
supported the C++11 standard since roughly 2012 (GCC 4.7) so this
should not cause any problems. It also requires an OMP library and
headers to be available, which rarely causes problems. Instructions to
get HTSlib, for macOS or Linux systems, can be found below.
Currently abismal requires a C++ compiler. The default compiler
assumed is g++ (comes with GCC, available on your Linux or macOS
machine). HTSlib is also required. Instructions to get HTSlib, for
macOS or Linux systems, can be found below.

If you have trouble with the `make` part of the installation procedure
described below, please contact us via e-mail or through a [GitHub
Expand Down
12 changes: 0 additions & 12 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,6 @@ and headers can be found.
dnl check for required libraries
AC_SEARCH_LIBS([hts_version], [hts], [], [AC_MSG_FAILURE([$hts_fail_msg])])


dnl OpenMP happens here
AC_OPENMP([C++])
AS_VAR_IF(OPENMP_CXXFLAGS, [], [
dnl check for the OpenMP library; can't be later
AC_SEARCH_LIBS([omp_get_num_threads], [gomp omp], [],
[AC_MSG_FAILURE([OpenMP library not found])])
dnl now we get setup for the right OpenMP flags
ADS_OPENMP([], [AC_MSG_FAILURE([OpenMP must be installed to build abismal])])
])dnl end of OpenMP stuff


dnl Optimize for shorter reads by compiling with a smaller window when
dnl making the index. When abismal loads the index, it compares the
dnl value with a constant so abismalidx and abismal must both be
Expand Down
159 changes: 0 additions & 159 deletions m4/ads_openmp.m4

This file was deleted.

123 changes: 0 additions & 123 deletions m4/ax_openmp.m4

This file was deleted.