Commit 4e129673 authored by Anton Gladky's avatar Anton Gladky

Refresh patches, remove applied by upstream

parent 8bbd4728
From 08b050532fa88fce29daeb5e5c601e1762d005df Mon Sep 17 00:00:00 2001
From: Anton Gladky <gladk@debian.org>
Date: Sun, 5 Nov 2017 11:08:39 +0100
Subject: [PATCH] Do not enable LINSOLV if CGAL not found. (Closes: #880792)
---
CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26f3d0f..132ef55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -315,7 +315,7 @@ IF(ENABLE_LINSOLV)
FIND_PACKAGE(Cholmod)
FIND_PACKAGE(OpenBlas)
FIND_PACKAGE(Metis)
- IF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND)
+ IF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND AND CGAL_FOUND)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CGAL_DEFINITIONS} -DLINSOLV -DFLOW_ENGINE")
SET(LINKLIBS "${LINKLIBS};${CHOLMOD_LIBRARIES};${AMD_LIBRARY};${CAMD_LIBRARY};${COLAMD_LIBRARY};${CCOLAMD_LIBRARY};${OPENBLAS_LIBRARY};${METIS_LIBRARY}")
INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIR} ${CHOLMOD_INCLUDE_DIR})
@@ -323,11 +323,11 @@ IF(ENABLE_LINSOLV)
MESSAGE(STATUS "Found OpenBlas")
MESSAGE(STATUS "Found Metis")
SET(CONFIGURED_FEATS "${CONFIGURED_FEATS} LINSOLV")
- ELSE(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND)
+ ELSE(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND AND CGAL_FOUND)
MESSAGE(STATUS "Missing dependency for LINSOLV, disabled")
SET(DISABLED_FEATS "${DISABLED_FEATS} LINSOLV")
SET(ENABLE_LINSOLV OFF)
- ENDIF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND)
+ ENDIF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND AND CGAL_FOUND)
ELSE(ENABLE_LINSOLV)
SET(DISABLED_FEATS "${DISABLED_FEATS} LINSOLV")
ENDIF(ENABLE_LINSOLV)
--
2.14.2
......@@ -5,17 +5,17 @@ Subject: [PATCH] Initialize gui in IPython 5.
core/main/main.py.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Index: yade/core/main/main.py.in
Index: trunk-master/core/main/main.py.in
===================================================================
--- yade.orig/core/main/main.py.in
+++ yade/core/main/main.py.in
@@ -244,6 +244,9 @@ def userSession(gui='none',qapp=None):
InteractiveShellEmbed.config=cfg
InteractiveShellEmbed.banner1=banner+'\n'
--- trunk-master.orig/core/main/main.py.in
+++ trunk-master/core/main/main.py.in
@@ -222,6 +222,9 @@ def userSession(gui='none',qapp=None):
for k in ipconfig: setattr(InteractiveShellEmbed,k,ipconfig[k])
InteractiveShellEmbed.banner1=banner+'\n' # called banner1 here, not banner anymore
ipshell=InteractiveShellEmbed()
+ # If IPython > 5 one need to initialize graphic gui
+ if ((gui == "qt5" or gui == "qt4")and yade.runtime.ipython_version>=500):
+ ipshell.enable_gui(gui)
ipshell()
## run userSession in a way corresponding to the features we use:
elif yade.runtime.ipython_version>=12:
if yade.runtime.ipython_version>=100:
From c7c8e6f62d452c81a31415f05a12587a6cc8c452 Mon Sep 17 00:00:00 2001
From: bchareyre <bruno.chareyre@grenoble-inp.fr>
Date: Fri, 14 Apr 2017 12:04:32 +0200
Subject: [PATCH] Critical bugfix for collision detection in periodic boundary
conditions. Bounds lists were left partially unordered, then some
interactions were never detected (my toughest yade debugging until now).
---
pkg/common/InsertionSortCollider.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkg/common/InsertionSortCollider.cpp b/pkg/common/InsertionSortCollider.cpp
index dc5d7ac..163a4f4 100644
--- a/pkg/common/InsertionSortCollider.cpp
+++ b/pkg/common/InsertionSortCollider.cpp
@@ -410,8 +410,10 @@ Real InsertionSortCollider::cellWrapRel(const Real x, const Real x0, const Real
void InsertionSortCollider::insertionSortPeri(VecBounds& v, InteractionContainer* interactions, Scene*, bool doCollide){
assert(periodic);
long &loIdx=v.loIdx; const long &size=v.size;
- for(long _i=0; _i<size; _i++){
- const long i=v.norm(_i);
+ /* We have to visit each bound at least once (first condition), but this is not enough. The correct ordering in the begining of the list needs a second pass to connect begin and end consistently (the second condition). Strictly the second condition should include "+ (v.norm(j+1)==loIdx ? v.cellDim : 0)" but it is ok as is since the shift is added inside the loop. */
+ long _i=0;
+ for(; (_i<size) || (v[v.norm(_i)].coord < v[v.norm(_i-1)].coord); _i++){
+ const long i=v.norm(_i);//FIXME: useless, and many others can probably be removed
const long i_1=v.norm(i-1);
//switch period of (i) if the coord is below the lower edge cooridnate-wise and just above the split
if(i==loIdx && v[i].coord<0){ v[i].period-=1; v[i].coord+=v.cellDim; loIdx=v.norm(loIdx+1); }
01_remove_google_analytics.patch
08_fix_gui.patch
09_fix_periodic_boundaries.patch
0001-Do-not-enable-LINSOLV-if-CGAL-not-found.-Closes-8807.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment