From 33255ee156cad3ac56bc8409e4059eb181348603 Mon Sep 17 00:00:00 2001
From: Jean-Matthieu Etancelin <jean-matthieu.etancelin@imag.fr>
Date: Thu, 12 Jul 2012 08:21:47 +0000
Subject: [PATCH] Add default kernel sources in setup.py for install non python
file
---
HySoP/hysop/__init__.py.in | 8 ++++----
HySoP/hysop/constants.py | 4 +++-
HySoP/setup.py.in | 4 ++--
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/HySoP/hysop/__init__.py.in b/HySoP/hysop/__init__.py.in
index 85cbbdae5..14ffc8da5 100755
--- a/HySoP/hysop/__init__.py.in
+++ b/HySoP/hysop/__init__.py.in
@@ -44,10 +44,10 @@ import problem.problem
Problem = problem.problem.Problem
## Solver
-import ParticularSolvers.basic
-import ParticularSolvers.gpu
-ParticleSolver = ParticularSolvers.basic.ParticleSolver
-GPUParticleSolver = ParticularSolvers.gpu.GPUParticleSolver
+import particular_solvers.basic
+import particular_solvers.gpu
+ParticleSolver = particular_solvers.basic.ParticleSolver
+GPUParticleSolver = particular_solvers.gpu.GPUParticleSolver
## Tools
import tools.printer
diff --git a/HySoP/hysop/constants.py b/HySoP/hysop/constants.py
index 6b4b94b95..ebe7f3745 100644
--- a/HySoP/hysop/constants.py
+++ b/HySoP/hysop/constants.py
@@ -7,6 +7,8 @@ Constant parameters required for the parmepy package (internal use).
import numpy as np
import math
+from parmepy.particular_solvers import __path__ as solver_path
+import os
#
PI = math.pi
@@ -28,4 +30,4 @@ PERIODIC = 0
## Directions string
S_DIR = ["_X", "_Y", "_Z"]
## GPU deflault sources
-GPU_SRC = "/Users/jmetancelin/These/SVN/parmes/Parmes/parmepy/ParticularSolvers/gpu_src.cl"
+GPU_SRC = os.path.join(solver_path[0], "gpu_src.cl")
diff --git a/HySoP/setup.py.in b/HySoP/setup.py.in
index 17d235b73..8da1883c4 100644
--- a/HySoP/setup.py.in
+++ b/HySoP/setup.py.in
@@ -86,6 +86,6 @@ setup(name=name,
license='GNU public license',
package_dir={'': '@CMAKE_SOURCE_DIR@'},
ext_modules=ext_modules,
- packages=packages
- #data_files=[('new_ParMePy/Utils', ['./new_ParMePy/Utils/gpu_src.cl'])]
+ packages=packages,
+ data_files=[('./parmepy/particular_solvers', ['@CMAKE_SOURCE_DIR@/parmepy/particular_solvers/gpu_src.cl'])]
)
--
GitLab