rpms / nest

Clone
Source Code
GIT

#7 WIP: feat: update to 3.7
Merged 17 days ago by ankursinha. Opened 23 days ago by ankursinha.
rpms/ ankursinha/nest feat/nest-3.7  into  rawhide

file modified
+2 
@@ -9,3 +9,5 @@ 
 

  /nest-3.3.tar.gz
 

  /nest-3.4.tar.gz
 

  /nest-simulator-3.6.tar.gz
 

+ /nest-simulator-3.7_rc1.tar.gz
 

+ /nest-simulator-3.7.tar.gz

0001-disable-python-setups.patch disable-python-setups.patch
file renamed
+12 
@@ -1,3 +1,12 @@ 
 

+ From 5bfe453bfef59d6264c8e987b3f3361bd458a9b5 Mon Sep 17 00:00:00 2001
 

+ From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 

+ Date: Mon, 8 Apr 2024 11:56:54 +0100
 

+ Subject: [PATCH 1/7] disable python setups
 

+ 

+ ---
 

+  doc/CMakeLists.txt | 12 ++++++------
 

+  1 file changed, 6 insertions(+), 6 deletions(-)
 

+ 

  diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
 

  index 14429eba6..bc0bc3771 100644
 

  --- a/doc/CMakeLists.txt
 
@@ -21,3 +30,6 @@ 
 

   endif ()
 

   

   # Determine in or out of tree building
 

+ -- 

+ 2.44.0
 

+

0002-tweak-PYEXECDIR.patch tweak-PYEXECDIR.patch
file renamed
+8 -8 
@@ -1,7 +1,7 @@ 
 

- From 131b8a047734a6774b50042bcb4ff5da7b84328f Mon Sep 17 00:00:00 2001
 

+ From 7b7e5bce5f41da5a511b87df416fd20e670313b4 Mon Sep 17 00:00:00 2001
 

  From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 

- Date: Fri, 13 Jan 2023 10:48:53 +0000
 

- Subject: [PATCH 2/6] tweak PYEXECDIR
 

+ Date: Mon, 8 Apr 2024 11:57:28 +0100
 

+ Subject: [PATCH 2/7] tweak PYEXECDIR
 

  

  ---
 

   bin/nest_vars.sh.in          | 2 +-
 
@@ -23,10 +23,10 @@ 
 

   # Make NEST executables available by prepending their path to PATH.
 

   export PATH="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@:${PATH}"
 

  diff --git a/cmake/ConfigureSummary.cmake b/cmake/ConfigureSummary.cmake
 

- index 62c0d08ca..f68bc4f89 100644
 

+ index 0e3eba620..b699d06c0 100644
 

  --- a/cmake/ConfigureSummary.cmake
 

  +++ b/cmake/ConfigureSummary.cmake
 

- @@ -234,7 +234,7 @@ function( NEST_PRINT_CONFIG_SUMMARY )
 

+ @@ -239,7 +239,7 @@ function( NEST_PRINT_CONFIG_SUMMARY )
 

     endif()
 

     if ( HAVE_PYTHON )
 

       message( "PyNEST will be installed to:" )
 
@@ -36,10 +36,10 @@ 
 

     endif ()
 

     message( "To set necessary environment variables, add the following line" )
 

  diff --git a/pynest/CMakeLists.txt b/pynest/CMakeLists.txt
 

- index f3b0218c4..92367dc04 100644
 

+ index 6d3129419..9a1f831db 100644
 

  --- a/pynest/CMakeLists.txt
 

  +++ b/pynest/CMakeLists.txt
 

- @@ -75,7 +75,7 @@ if ( HAVE_PYTHON )
 

+ @@ -74,7 +74,7 @@ if ( HAVE_PYTHON )
 

         )
 

   

     install(DIRECTORY  nest/ ${PROJECT_BINARY_DIR}/pynest/nest/
 
@@ -49,5 +49,5 @@ 
 

     )
 

     install( TARGETS pynestkernel DESTINATION ${PYEXECDIR}/nest/ )
 

  -- 

- 2.40.1
 

+ 2.44.0

0003-use-system-Random123.patch use-system-Random123.patch
file renamed
+15 -2 
@@ -1,8 +1,18 @@ 
 

+ From 6b75663af76bd2e3f45fed7072f417fa9740e79b Mon Sep 17 00:00:00 2001
 

+ From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 

+ Date: Mon, 8 Apr 2024 11:58:05 +0100
 

+ Subject: [PATCH 3/7] use system Random123
 

+ 

+ ---
 

+  CMakeLists.txt            |  1 -
 

+  thirdparty/CMakeLists.txt | 24 ------------------------
 

+  2 files changed, 25 deletions(-)
 

+ 

  diff --git a/CMakeLists.txt b/CMakeLists.txt
 

- index a924f3ebf..8c8c5980f 100644
 

+ index f060a5c93..985510e8d 100644
 

  --- a/CMakeLists.txt
 

  +++ b/CMakeLists.txt
 

- @@ -184,7 +184,6 @@ nest_check_have_stl_vector_capacity_doubling()
 

+ @@ -179,7 +179,6 @@ nest_check_have_stl_vector_capacity_doubling()
 

   nest_check_have_xlc_ice_on_using()
 

   nest_check_have_std_nan()
 

   nest_check_have_std_isnan()
 
@@ -46,3 +56,6 @@ 
 

  -install( DIRECTORY Random123/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nest/Random123
 

  -         FILES_MATCHING PATTERN "*.h" )
 

  -
 

+ -- 

+ 2.44.0
 

+

0004-remove-rpath.patch remove-rpath.patch
file renamed
+13 -1 
@@ -1,5 +1,14 @@ 
 

+ From bf9da5f290a4e29af4621e27da01a9e11a1e302a Mon Sep 17 00:00:00 2001
 

+ From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 

+ Date: Mon, 8 Apr 2024 11:59:16 +0100
 

+ Subject: [PATCH 4/7] remove rpath
 

+ 

+ ---
 

+  cmake/ProcessOptions.cmake | 51 --------------------------------------
 

+  1 file changed, 51 deletions(-)
 

+ 

  diff --git a/cmake/ProcessOptions.cmake b/cmake/ProcessOptions.cmake
 

- index e20c3086d..89881f811 100644
 

+ index 485e94a55..80a17abf3 100644
 

  --- a/cmake/ProcessOptions.cmake
 

  +++ b/cmake/ProcessOptions.cmake
 

  @@ -148,8 +148,6 @@ function( NEST_PROCESS_STATIC_LIBRARIES )
 
@@ -67,3 +76,6 @@ 
 

       if ( UNIX OR APPLE )
 

         # reverse the search order for lib extensions
 

         set( CMAKE_FIND_LIBRARY_SUFFIXES ".so;.dylib;.a;.lib" PARENT_SCOPE )
 

+ -- 

+ 2.44.0
 

+

0005-install-in-libdir.patch install-in-libdir.patch
file renamed
+19 -4 
@@ -1,8 +1,20 @@ 
 

+ From 7f9162613fd33ae13f2c9287fad0d0ca1e5b0ce3 Mon Sep 17 00:00:00 2001
 

+ From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 

+ Date: Mon, 8 Apr 2024 11:59:43 +0100
 

+ Subject: [PATCH 5/7] install in libdir
 

+ 

+ ---
 

+  cmake/ConfigureSummary.cmake | 2 +-
 

+  libnestutil/config.h.in      | 2 +-
 

+  nest/CMakeLists.txt          | 4 ++--
 

+  sli/CMakeLists.txt           | 4 ++--
 

+  4 files changed, 6 insertions(+), 6 deletions(-)
 

+ 

  diff --git a/cmake/ConfigureSummary.cmake b/cmake/ConfigureSummary.cmake
 

- index 5e1c8a14b..8352c040e 100644
 

+ index b699d06c0..831aa65ec 100644
 

  --- a/cmake/ConfigureSummary.cmake
 

  +++ b/cmake/ConfigureSummary.cmake
 

- @@ -241,7 +241,7 @@ function( NEST_PRINT_CONFIG_SUMMARY )
 

+ @@ -230,7 +230,7 @@ function( NEST_PRINT_CONFIG_SUMMARY )
 

     message( "  ${CMAKE_INSTALL_FULL_BINDIR}/" )
 

     message( "" )
 

     message( "NEST dynamic libraries and user modules will be installed to:" )
 
@@ -25,10 +37,10 @@ 
 

   #define MPIEXEC "@MPIEXEC@"
 

   #define MPIEXEC_NUMPROC_FLAG "@MPIEXEC_NUMPROC_FLAG@"
 

  diff --git a/nest/CMakeLists.txt b/nest/CMakeLists.txt
 

- index e0a8e7413..75b1ab952 100644
 

+ index 7a21c573c..f3b534ba9 100644
 

  --- a/nest/CMakeLists.txt
 

  +++ b/nest/CMakeLists.txt
 

- @@ -96,8 +96,8 @@ if ( HAVE_PYTHON )
 

+ @@ -95,8 +95,8 @@ if ( HAVE_PYTHON )
 

   endif ()
 

   

   install( TARGETS nest nest_lib
 
@@ -54,3 +66,6 @@ 
 

       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 

       )
 

   

+ -- 

+ 2.44.0
 

+

0006-use-online-documentation.patch use-online-documentation.patch
file renamed
+12 
@@ -1,3 +1,12 @@ 
 

+ From 78fa790e7a506e9cd080375ebde87004345852f9 Mon Sep 17 00:00:00 2001
 

+ From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 

+ Date: Mon, 8 Apr 2024 12:00:16 +0100
 

+ Subject: [PATCH 6/7] use online documentation
 

+ 

+ ---
 

+  pynest/nest/lib/hl_api_info.py | 10 ++++------
 

+  1 file changed, 4 insertions(+), 6 deletions(-)
 

+ 

  diff --git a/pynest/nest/lib/hl_api_info.py b/pynest/nest/lib/hl_api_info.py
 

  index 5a878c6c1..8461e78ce 100644
 

  --- a/pynest/nest/lib/hl_api_info.py
 
@@ -19,3 +28,6 @@ 
 

   

   

   @check_stack
 

+ -- 

+ 2.44.0
 

+

file added
+42 
@@ -0,0 +1,42 @@ 
 

+ From 593e18caf15cf3d0c73a96f4e5e7105c0e378233 Mon Sep 17 00:00:00 2001
 

+ From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 

+ Date: Mon, 8 Apr 2024 14:56:02 +0100
 

+ Subject: [PATCH 7/7] remove hard coded O0
 

+ 

+ ---
 

+  nestkernel/CMakeLists.txt | 4 ----
 

+  sli/CMakeLists.txt        | 3 ---
 

+  2 files changed, 7 deletions(-)
 

+ 

+ diff --git a/nestkernel/CMakeLists.txt b/nestkernel/CMakeLists.txt
 

+ index 50f99859f..553a440a1 100644
 

+ --- a/nestkernel/CMakeLists.txt
 

+ +++ b/nestkernel/CMakeLists.txt
 

+ @@ -136,10 +136,6 @@ if ( HAVE_MPI )
 

+  endif ()
 

+  

+  

+ -# Prevent problems with Conda path substitution (see #2348)
 

+ -set_source_files_properties( dynamicloader.cpp PROPERTIES COMPILE_OPTIONS "-O0" )
 

+ -
 

+ -
 

+  add_library( nestkernel STATIC ${nestkernel_sources} )
 

+  set_target_properties( nestkernel
 

+      PROPERTIES
 

+ diff --git a/sli/CMakeLists.txt b/sli/CMakeLists.txt
 

+ index 4ee036195..906258017 100644
 

+ --- a/sli/CMakeLists.txt
 

+ +++ b/sli/CMakeLists.txt
 

+ @@ -83,9 +83,6 @@ set( sli_sources
 

+      )
 

+  

+  

+ -# Prevent problems with Conda path substitution (see #2348) 

+ -set_source_files_properties( slistartup.cc PROPERTIES COMPILE_OPTIONS "-O0" )
 

+ -
 

+  add_library( sli_lib ${sli_sources} )
 

+  

+  set_target_properties( sli_lib
 

+ -- 

+ 2.44.0
 

+

file modified
+14 -9 
@@ -49,7 +49,7 @@ 
 

  %endif
 

  

  Name:           nest
 

- Version:        3.6
 

+ Version:        3.7
 

  Release:        %autorelease
 

  Summary:        The neural simulation tool
 

  %forgemeta
 
@@ -62,23 +62,27 @@ 
 

  Source0:        %forgesource
 

  Source1:        README-Fedora.md
 

  

+ # https://github.com/sanjayankur31/nest-simulator/tree/fedora-3.7
 

  # 1. Let it build and install the cythonised shared object But we still build
 

  # our python modules ourselves
 

  

  # 2. The helpindex must be generated after the help files have been installed
 

  # to the install location, so we do this manually because the script doesn't
 

  # respect rpmbuildroot and so on
 

- Patch:          disable-python-setups.patch
 

+ Patch:          0001-disable-python-setups.patch
 

  # Tweak PYEXECDIR
 

- Patch:          tweak-PYEXECDIR.patch
 

+ Patch:          0002-tweak-PYEXECDIR.patch
 

  # Use system Random123
 

- Patch:          use-system-Random123.patch
 

+ Patch:          0003-use-system-Random123.patch
 

  # Remove rpath
 

- Patch:          remove-rpath.patch
 

+ Patch:          0004-remove-rpath.patch
 

  # Install in standard libdir
 

- Patch:          install-in-libdir.patch
 

+ Patch:          0005-install-in-libdir.patch
 

  # Use online docs for helpdesk
 

- Patch:          use-online-documentation.patch
 

+ Patch:          0006-use-online-documentation.patch
 

+ 

+ # Remove hard coded O0
 

+ Patch:          0007-remove-hard-coded-O0.patch
 

  

  # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 

  ExcludeArch:    %{ix86}
 
@@ -240,10 +244,11 @@ 
 

  %forgeautosetup -p1
 

  cp %{SOURCE1} ./ -v
 

  

- # Version used in tag is 3.6 and the tarball is named accordingly.
 

- # However the file VERSION contains '3.6.0'. Let's fix that!
 

+ # Fix VERSION
 

+ # TODO: Check if needed with each release
 

  echo %{version} > VERSION
 

  

+ 

  # Tweaks
 

  # We'll set it ourselves - easier for mpi implementations
 

  sed -i.orig '/PYEXECDIR/ d' cmake/ProcessOptions.cmake

file modified
+1 -1 
@@ -1,1 +1,1 @@ 
 

- SHA512 (nest-simulator-3.6.tar.gz) = 48289ad845b4ad32f07a19882f7a52d167351e80e3f777bbad41e083885220b65f72498b65b0ce48837173b05acf4aeefc2f6d614b7e1536624ded4aa5c0ab6a
 

+ SHA512 (nest-simulator-3.7.tar.gz) = 453fd0299dc07538ec02f0c71efa587d4561318bfdd5ed06af777cbda37c14f1cd1880f86346546563a23e1a73ff0c59cc82e26327de159499078527ab73007b

Tests the release candidate, so will need a few final tweaks before it's ready to merge.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/3f7091648b6e4b028f99c54def8d5af6

1 new commit added

  • feat: remove hard coded O0
23 days ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/90fa1ffcbc2945e4ad8b62f5a491ce66

1 new commit added

  • feat: update to 3.7 (fixes rh#2271373)
17 days ago

Pull-Request has been merged by ankursinha
17 days ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/4ad9ed4581034b91b408c00252fed608
Metadata
None
No Tags
Changes Summary 10
+2 -0
file changed
.gitignore
+12 -0
file renamed
disable-python-setups.patch
0001-disable-python-setups.patch
+8 -8
file renamed
tweak-PYEXECDIR.patch
0002-tweak-PYEXECDIR.patch
+15 -2
file renamed
use-system-Random123.patch
0003-use-system-Random123.patch
+13 -1
file renamed
remove-rpath.patch
0004-remove-rpath.patch
+19 -4
file renamed
install-in-libdir.patch
0005-install-in-libdir.patch
+12 -0
file renamed
use-online-documentation.patch
0006-use-online-documentation.patch
+42
file added
0007-remove-hard-coded-O0.patch
+14 -9
file changed
nest.spec
+1 -1
file changed
sources
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.