Merge branch 'master' into fix-trunk-install

Author: Damian Rouson

.travis.yml

@@ -166,7 +166,7 @@ script:
       cd cmake-build
       cmake -DCMAKE_INSTALL_PREFIX:PATH="$HOME/OpenCoarrays" -DCMAKE_BUILD_TYPE="$BUILD_TYPE" ..
       make -j 4
-      ctest --verbose
+      ctest --output-on-failure
       make install
       cd ..
     fi

CMakeLists.txt

@@ -7,7 +7,7 @@ set ( CMAKE_BUILD_TYPE "Release"
 set_property ( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} )
 
 #Name project and specify source languages
-project(opencoarrays VERSION 1.7.3 LANGUAGES C Fortran)
+project(opencoarrays VERSION 1.7.5 LANGUAGES C Fortran)
 
 #Print an error message on an attempt to build inside the source directory tree:
 if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
@@ -148,9 +148,12 @@ configure_file ( "${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in" "${CMAKE_BINARY_
 add_custom_target ( uninstall
   COMMAND ${CMAKE_COMMAND} -P "${CMAKE_BINARY_DIR}/uninstall.cmake" )
 
-
 enable_testing()
 
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
+# See JSON-Fortran's CMakeLists.txt file to find out how to get the check target to depend
+# on the test executables
+
 # Determine if we're using Open MPI
 execute_process(COMMAND ${MPIEXEC} --version
   OUTPUT_VARIABLE mpi_version_out)
@@ -190,6 +193,7 @@ if(opencoarrays_aware_compiler)
   add_mpi_test(allocate_as_barrier 2 ${tests_root}/unit/init_register/allocate_as_barrier)
   add_mpi_test(allocate_as_barrier_proc 32 ${tests_root}/unit/init_register/allocate_as_barrier_proc)
   add_mpi_test(get_array 2 ${tests_root}/unit/send-get/get_array)
+  add_mpi_test(get_self 2 ${tests_root}/unit/send-get/get_self)
   add_mpi_test(send_array 2 ${tests_root}/unit/send-get/send_array)
   add_mpi_test(get_with_offset_1d 2 ${tests_root}/unit/send-get/get_with_offset_1d)
   add_mpi_test(whole_get_array 2 ${tests_root}/unit/send-get/whole_get_array)
@@ -200,17 +204,21 @@ if(opencoarrays_aware_compiler)
   add_mpi_test(co_max 4 ${tests_root}/unit/collectives/co_max_test)
   add_mpi_test(syncall 32 ${tests_root}/unit/sync/syncall)
   add_mpi_test(syncimages 32 ${tests_root}/unit/sync/syncimages)
+  add_mpi_test(syncimages2 32 ${tests_root}/unit/sync/syncimages2)
   add_mpi_test(duplicate_syncimages 8 ${tests_root}/unit/sync/duplicate_syncimages)
   add_mpi_test(co_reduce 4 ${tests_root}/unit/collectives/co_reduce_test)
   add_mpi_test(syncimages_status 32 ${tests_root}/unit/sync/syncimages_status)
+  add_mpi_test(simpleatomics 32 ${tests_root}/unit/simple/atomics)
+  # possible logic error in the following test
+#  add_mpi_test(increment_my_neighbor 32 ${tests_root}/unit/simple/increment_my_neighbor)
 
   # Integration tests verifying the use of libcaf_mpi in applications
   add_mpi_test(hello_multiverse 2 ${tests_root}/integration/coarrayHelloWorld/hello_multiverse)
   add_mpi_test(coarray_burgers_pde 2 ${tests_root}/integration/pde_solvers/coarrayBurgers/coarray_burgers_pde)
   add_mpi_test(co_heat 2 ${tests_root}/integration/pde_solvers/coarrayHeatSimplified/co_heat)
   add_mpi_test(asynchronous_hello_world 2 ${tests_root}/integration/events/asynchronous_hello_world)
   if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") )
-    if ( NOT (DEFINED ENV{TRAVIS}))
+    if ( (NOT (DEFINED ENV{TRAVIS})) AND (NOT SKIP_ASSEMBLY_DEPS) )
       add_mpi_test(coarray_navier_stokes 2 ${tests_root}/integration/pde_solvers/navier-stokes/coarray_navier_stokes)
       set_property(TEST coarray_navier_stokes PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")
     endif()

LICENSE

@@ -1,35 +1,29 @@
-OpenCoarrays
+BSD 3-Clause License
 
--- A Coarray Fortran application binary interface, application programmer
-    interface, and compiler wrapper.
-
-Copyright (c) 2015-2016, Sourcery Institute
-Copyright (c) 2015-2016, Sourcery, Inc.
+Copyright (c) 2016, Sourcery Institute
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+modification, are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-3. Neither the name of the copyright holder nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

src/libcaf.h

@@ -233,12 +233,16 @@ void PREFIX(sendget_by_ref) (caf_token_t dst_token, int dst_image_index,
 		bool may_require_tmp, int *dst_stat, int *src_stat);
 #endif
 
+void PREFIX (co_broadcast) (gfc_descriptor_t *, int, int *, char *, int);			    
 void PREFIX (co_max) (gfc_descriptor_t *, int, int *, char *, int, int);
 void PREFIX (co_min) (gfc_descriptor_t *, int, int *, char *, int, int);
+void PREFIX (co_reduce) (gfc_descriptor_t *, void *(*opr) (void *, void *),
+			 int, int, int *, char *, int , int);
 void PREFIX (co_sum) (gfc_descriptor_t *, int, int *, char *, int);
 
 void PREFIX (sync_all) (int *, char *, int);
 void PREFIX (sync_images) (int, int[], int *, char *, int);
+void PREFIX (sync_memory) (int *, char *, int);
 
 void PREFIX (error_stop_str) (const char *, int32_t)
      __attribute__ ((noreturn));

src/mpi/CMakeLists.txt

@@ -17,6 +17,13 @@ endif()
 
 add_library(caf_mpi mpi_caf.c ../common/caf_auxiliary.c ../extensions/opencoarrays.F90)
 
+set_target_properties ( caf_mpi
+  PROPERTIES
+  SOVERSION ${PROJECT_VERSION.MAJOR}.${PROJECT_VERSION.MINOR}
+  VERSION ${PROJECT_VERSION}
+  )
+
+
 target_include_directories(caf_mpi PRIVATE ${MPI_C_INCLUDE_PATH})
 if (gfortran_compiler)
   target_compile_options(caf_mpi INTERFACE -fcoarray=lib)
@@ -26,6 +33,7 @@ include_directories(${CMAKE_BINARY_DIR}/mod)
 
 install(TARGETS caf_mpi EXPORT OpenCoarraysTargets
   ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
 )
 install(DIRECTORY  ${CMAKE_BINARY_DIR}/mod DESTINATION .)
 

src/tests/CMakeLists.txt

@@ -1,6 +1,9 @@
 if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
   option(HIGH_RESOLUTION_TIMER "use the walltime.o wallclock timer" FALSE)
   option(LEGACY_ARCHITECTURE "use the SSE-enabled FFT library" FALSE)
+
+  # Let package maintainers disable fft library written in assembly
+  option ( SKIP_ASSEMBLY_DEPS "Skip buidling/running tests that depend on files written in assembly" FALSE )
 endif()
 
 if (HIGH_RESOLUTION_TIMER)

src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt

@@ -1,7 +1,7 @@
 # checking whether the machine is of type 64-bit before proceeding further
 if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") )
   # Default to older SSE-instruction-based FFT library
-  if (NOT (DEFINED ENV{TRAVIS}))
+  if (NOT (DEFINED ENV{TRAVIS}) AND (NOT SKIP_ASSEMBLY_DEPS) )
     if (LEGACY_ARCHITECTURE OR (NOT DEFINED(LEGACY_ARCHITECTURE)))
       set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_sse.a )
     else()

src/tests/unit/send-get/get_array_test.f90

@@ -14,8 +14,8 @@ program main
   call one(0, -11)
 
   ! Static coarrays
-!  call two()
-!  call three()
+  call two()
+  call three()
   write(*,*) 'Test passed'
 contains
   subroutine one(lb1, lb2)
@@ -42,7 +42,7 @@ subroutine one(lb1, lb2)
     end if
     sync all
     if(this_image()==1) then
-       if(any (a /= c))   call abort()
+       if(any (a /= c)) error stop "ARRAY = SCALAR failed in get_array_test"
     endif
 
     ! Whole array: ARRAY = ARRAY
@@ -59,7 +59,7 @@ subroutine one(lb1, lb2)
           print *, a
           print *, c
           ! FIXME: Without the print lines above, it always fails. Why?
-          call abort()
+          error stop "ARRAY = ARRAY failed in get_array_test"
        end if
     endif
 
@@ -98,7 +98,7 @@ subroutine one(lb1, lb2)
           print *, this_image(), ': ', a
           print *, this_image(), ': ', c
           ! FIXME: Without the print lines above, it always fails. Why?
-          call abort()
+          error stop "scalar assignment failed in get_array_test"
        end if
     endif
     ! Array sections with different ranges and pos/neg strides
@@ -130,7 +130,7 @@ subroutine one(lb1, lb2)
                                   print *, a
                                   print *, c
                                   print *, a-c
-                                  call abort()
+                                  error stop "array sections with ranges and strides failed in get_array_test"
                                endif
                             end if
                             ! ARRAY = ARRAY
@@ -155,7 +155,7 @@ subroutine one(lb1, lb2)
                                   print *, a
                                   print *, c
                                   print *, a-c
-                                  call abort()
+                                  error stop "array sections with ranges and strides failed in get_array_test"
                                endif
                             end if
                          end do
@@ -189,7 +189,7 @@ subroutine two()
     sync all
     if (this_image() == num_images()) then
       if (any (a /= caf)) &
-           call abort()
+           error stop "Array = scalar failed in subroutine two get_array_test"
     end if
 
     ! Whole array: ARRAY = ARRAY
@@ -203,7 +203,7 @@ subroutine two()
     sync all
     if (this_image() == num_images()) then
       if (any (a /= caf)) &
-           call abort()
+           error stop "Array = array failed in subroutine two get_array_test"
     end if
 
     ! Scalar assignment
@@ -235,7 +235,7 @@ subroutine two()
     sync all
     if (this_image() == num_images()) then
       if (any (a /= caf)) &
-           call abort()
+           error stop "scalar assignment failed in subroutine two get_array_test"
     end if
 
     ! Array sections with different ranges and pos/neg strides
@@ -280,7 +280,7 @@ subroutine two()
                         print *, a
                         print *, caf
                         print *, a-caf
-                        call abort()
+                        error stop "arrays with ranges and strides failed sub. two get_array_test failed"
                       endif
                     end if
                   end do
@@ -314,7 +314,7 @@ subroutine three()
     sync all
     if (this_image() == num_images()) then
       if (any (a /= caf)) &
-           call abort()
+           error stop "Array = scalar subroutine three get_array_test failed"
     end if
 
     ! Whole array: ARRAY = ARRAY
@@ -328,7 +328,7 @@ subroutine three()
     sync all
     if (this_image() == num_images()) then
       if (any (a /= caf)) &
-           call abort()
+           error stop "Array = array subroutine three get_array_test failed"
     end if
 
     ! Scalar assignment
@@ -360,7 +360,7 @@ subroutine three()
     sync all
     if (this_image() == num_images()) then
       if (any (a /= caf)) &
-           call abort()
+           error stop "scalar assignment subroutine three get_array_test failed"
     end if
 
     ! Array sections with different ranges and pos/neg strides
@@ -405,7 +405,7 @@ subroutine three()
                         print *, a
                         print *, caf
                         print *, a-caf
-                        call abort()
+                        error stop "range stride in subroutine three get_array_test failed"
                       endif
                     end if
                   end do

src/tests/unit/send-get/get_with_offset_1d.f90

@@ -23,9 +23,9 @@ program get_offset_1d
 
   if(me == 1) then
     do i=1,10
-      if(b(i) /= 20+i+me+1) call abort()
+      if(b(i) /= 20+i+me+1) error stop "get offset 1d failed"
     enddo
-    write(*,*) 'Test passed.'
   endif
-sync all
+  sync all
+  if(me ==1) write(*,*) 'Test passed.'
 end program

src/tests/unit/send-get/old_get_array_test.f90

@@ -45,7 +45,7 @@ subroutine one(lb1, lb2)
       if (any (a /= b(lb1,lb2))) then
 ! FIXME: ABORTS UNLESS THERE IS SOME OTHER CODE
 print *, 'HELLO!!!!!!!!!!!!!!!!!'
-        call abort()
+        error stop
       end if
     end if
 
@@ -63,7 +63,7 @@ subroutine one(lb1, lb2)
         print *, a
         print *, b
         print *, 'WRONG:', any (a /= b)
-        call abort()
+        error stop
       end if
     end if
 
@@ -114,7 +114,7 @@ subroutine one(lb1, lb2)
  !                       print *, a
  !                       print *, caf
  !                       print *, a-caf
- !                       call abort()
+ !                       error stop
  !                     endif
                     end if
                   end do
@@ -152,7 +152,7 @@ subroutine two()
     sync all
     if (this_image() == 1) then
       if (any (a /= b)) &
-           call abort()
+           error stop
     end if
 
     ! Whole array: ARRAY = ARRAY
@@ -170,7 +170,7 @@ subroutine two()
     sync all
     if (this_image() == 1) then
       if (any (a /= b)) &
-           call abort()
+           error stop
     end if
 
     ! Array sections with different ranges and pos/neg strides
@@ -221,7 +221,7 @@ subroutine two()
  !                       print *, a
  !                       print *, caf
  !                       print *, a-caf
- !                       call abort()
+ !                       error stop
  !                     endif
                     end if
                   end do
@@ -259,7 +259,7 @@ subroutine three()
     sync all
     if (this_image() == 1) then
       if (any (a /= b)) &
-           call abort()
+           error stop
     end if
 
     ! Whole array: ARRAY = ARRAY
@@ -277,7 +277,7 @@ subroutine three()
     sync all
     if (this_image() == 1) then
       if (any (a /= b)) &
-           call abort()
+           error stop
     end if
 
     ! Array sections with different ranges and pos/neg strides
@@ -329,7 +329,7 @@ subroutine three()
 !                        print *, a
 !                        print *, caf
 !                        print *, a-caf
-!                        call abort()
+!                        error stop
 !                      endif
                     end if
                   end do