pool/cadabra2
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 593224 from home:badshah400:branches:science

Browse Source 
- Update to version 2.2.0:
  * Experimental support for modifying the expression tree
    directly from Python (see e.g. Fourier transforms).
  * Fix for integration by parts (gh#kpeeters/cadabra2#71)
  * Fix for incorrect conversion to sympy expressions.
  * Optionally build with support for Mathematica scalar backend;
    see map_mma.
  * Many bugfixes for expression display and sympy conversion.
  * Now using pybind instead of boost.python, in preparation for
  * Windows port, and to enable building against Anaconda.
  * Copy/paste of output cells added.
  * New simplify command, which simplifies the scalar parts of
    expressions, and can be switched to use either Sympy or
    Mathematica.
  * Fix to treat derivatives with respect to explicit coordinates
    as scalars in evaluate; see this Q&A post.
  * Fix for failure to flag errors for WeightInherit property.
  * Fixed: vary on single-term expressions
  * (gh#kpeeters/cadabra2#57)
  * Fixed: evaluate with dense factors and no 'values' property on
    indices (gh#kpeeters/cadabra2#68)
- Rename and rebase cadabra2-2.1.7.patch to
  cadabra2-add-pthread-to-cxxflags.patch.
- Add BuildRequires: libboost_date_time1_66_0-devel, new
  dependency with version 2.2.0.
- All python bindings are now required to be installed in
  _datadir.
- New binary cadabra2cadabra.

OBS-URL: https://build.opensuse.org/request/show/593224
OBS-URL: https://build.opensuse.org/package/show/science/cadabra2?expand=0&rev=19
This commit is contained in:
Atri Bhattacharya 2018-04-06 13:47:12 +00:00 committed by Git OBS Bridge
parent 40c8e04b30
commit 64f6087492
6 changed files with 58 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
2.1.7.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95866f8af23ad7b166379b1db767484985a0ee87e75d5a8bc03d22708f705f1e
size 4595561

3
2.2.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e0a408ab8fa611091bc4d776dd44efd730c2651e02e62cfd0251bd1d6b96249
size 23915602

12
cadabra2-2.1.7.patch
View File

@ -1,12 +0,0 @@
diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cadabra2-2.1.7/CMakeLists.txt ./CMakeLists.txt
--- ../orig-cadabra2-2.1.7/CMakeLists.txt 2017-11-19 20:27:27.000000000 +0100
+++ ./CMakeLists.txt 2017-12-29 09:34:50.496366051 +0100
@@ -202,7 +202,7 @@
include(CPack)
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -pthread")
endif()
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")

13
cadabra2-add-pthread-to-cxxflags.patch Normal file
View File

@ -0,0 +1,13 @@
Index: cadabra2-2.2.0/CMakeLists.txt
===================================================================
--- cadabra2-2.2.0.orig/CMakeLists.txt
+++ cadabra2-2.2.0/CMakeLists.txt
@@ -80,7 +80,7 @@ debug_message("Initial compiler flags: $
# GCC
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Wno-unused-but-set-variable")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Wno-unused-but-set-variable -pthread")
endif()
# Clang

32
cadabra2.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Fri Mar 30 10:21:17 UTC 2018 - badshah400@gmail.com
- Update to version 2.2.0:
* Experimental support for modifying the expression tree
directly from Python (see e.g. Fourier transforms).
* Fix for integration by parts (gh#kpeeters/cadabra2#71)
* Fix for incorrect conversion to sympy expressions.
* Optionally build with support for Mathematica scalar backend;
see map_mma.
* Many bugfixes for expression display and sympy conversion.
* Now using pybind instead of boost.python, in preparation for
* Windows port, and to enable building against Anaconda.
* Copy/paste of output cells added.
* New simplify command, which simplifies the scalar parts of
expressions, and can be switched to use either Sympy or
Mathematica.
* Fix to treat derivatives with respect to explicit coordinates
as scalars in evaluate; see this Q&A post.
* Fix for failure to flag errors for WeightInherit property.
* Fixed: vary on single-term expressions
* (gh#kpeeters/cadabra2#57)
* Fixed: evaluate with dense factors and no 'values' property on
indices (gh#kpeeters/cadabra2#68)
- Rename and rebase cadabra2-2.1.7.patch to
cadabra2-add-pthread-to-cxxflags.patch.
- Add BuildRequires: libboost_date_time1_66_0-devel, new
dependency with version 2.2.0.
- All python bindings are now required to be installed in
_datadir.
- New binary cadabra2cadabra.
-------------------------------------------------------------------
Fri Feb 2 21:21:57 UTC 2018 - stefan.bruens@rwth-aachen.de

23
cadabra2.spec
View File

@ -17,23 +17,24 @@
Name: cadabra2
Version: 2.1.7
Version: 2.2.0
Release: 0
Summary: A computer algebra system for solving problems in field theory
License: GPL-3.0+
License: GPL-3.0-or-later
Group: Productivity/Scientific/Math
Url: http://cadabra.science/
Source0: https://github.com/kpeeters/cadabra2/archive/%{version}.tar.gz
Source1: %{name}-rpmlintrc
Source2: %{name}-gtk.appdata.xml
# PATCH-FIX-OPENSUSE add -pthread to CMAKE_CXX_FLAGS (as adivised in https://github.com/potree/PotreeConverter/issues/136) kkaempf@suse.de
Patch1: cadabra2-2.1.7.patch
Patch1: cadabra2-add-pthread-to-cxxflags.patch
BuildRequires: appstream-glib
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: gmp-devel
BuildRequires: hicolor-icon-theme
BuildRequires: libboost_date_time1_66_0-devel
BuildRequires: libuuid-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
@ -199,6 +200,11 @@ install -D -m0644 %{S:2} %{buildroot}%{_datadir}/metainfo/%{name}-gtk.appdata.xm
# Replace "/usr/bin/env python3" hashbang by "/usr/bin/python3"
sed -E -i "s|^#!/usr/bin/env python3|#!/usr/bin/python3|" %{buildroot}%{_bindir}/cadabra2
rm %{buildroot}%{_libexecdir}/*.a
mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/
ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/
%post
# FIXME: ENABLE WHEN LATEX DOC BUILDING IS FIXED
#%{_bindir}/texhash
@ -222,21 +228,12 @@ sed -E -i "s|^#!/usr/bin/env python3|#!/usr/bin/python3|" %{buildroot}%{_bindir}
%files
%defattr(-,root,root)
%doc README.rst doc/license.txt
%{_bindir}/cadabra2cadabra
%{_bindir}/cadabra-server
%{_bindir}/%{name}
%{_bindir}/%{name}python
%{_bindir}/%{name}html
%if 0%{?suse_version} > 1320
%{python3_sitearch}/cdb
%{python3_sitearch}/cadabra2.so
%{python3_sitearch}/cadabra2_defaults.py
%else
%{python_sitearch}/cdb
%{python_sitearch}/cadabra2.so
%{python_sitearch}/cadabra2_defaults.py
%endif
%{_datadir}/%{name}/
%{_libexecdir}/*.so
%{_datadir}/texmf/tex/latex/cadabra2/
%files gui