publicImage/gprMax
1
0
派生 0
镜像自地址 https://gitee.com/sunhf/gprMax.git 已同步 2025-08-07 04:56:51 +08:00
代码 工单 软件包 项目 版本发布 百科 动态

Merge pull request #225 from gprMax/bug_instability

浏览代码 
Bug instability
这个提交包含在：
Craig Warren
2019-09-05 08:12:12 +01:00
提交者 GitHub
父节点 1bc75fb811 71c86d152b
当前提交 7d5b4f5c96
共有 2 个文件被更改，包括 5 次插入 和 6 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

6
gprMax/gprMax.py
查看文件

@@ -25,12 +25,6 @@ import sys
from enum import Enum from enum import Enum
# There is a bug with threading and MKL on macOS
# (https://github.com/gprMax/gprMax/issues/195) . Setting the MKL threading
# layer to sequential solves it, but must be done before numpy is imported.
if sys.platform == 'darwin':
os.environ["MKL_THREADING_LAYER"] = 'sequential'
import h5py import h5py
import numpy as np import numpy as np

5
setup.py
查看文件

@@ -106,12 +106,14 @@ if 'cleanall' in sys.argv:
# Now do a normal clean # Now do a normal clean
sys.argv[1] = 'clean' # this is what distutils understands sys.argv[1] = 'clean' # this is what distutils understands
# Set compiler options # Set compiler options
# Windows # Windows
if sys.platform == 'win32': if sys.platform == 'win32':
compile_args = ['/O2', '/openmp', '/w'] # No static linking as no static version of OpenMP library; /w disables warnings compile_args = ['/O2', '/openmp', '/w'] # No static linking as no static version of OpenMP library; /w disables warnings
linker_args = [] linker_args = []
extra_objects = [] extra_objects = []
libraries=[]
# Mac OS X - needs gcc (usually via HomeBrew) because the default compiler LLVM (clang) does not support OpenMP # Mac OS X - needs gcc (usually via HomeBrew) because the default compiler LLVM (clang) does not support OpenMP
# - with gcc -fopenmp option implies -pthread # - with gcc -fopenmp option implies -pthread
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
@@ -124,12 +126,14 @@ elif sys.platform == 'darwin':
raise('Cannot find gcc 4-9 in /usr/local/bin. gprMax requires gcc to be installed - easily done through the Homebrew package manager (http://brew.sh). Note: gcc with OpenMP support is required.') raise('Cannot find gcc 4-9 in /usr/local/bin. gprMax requires gcc to be installed - easily done through the Homebrew package manager (http://brew.sh). Note: gcc with OpenMP support is required.')
compile_args = ['-O3', '-w', '-fopenmp', '-march=native'] # Sometimes worth testing with '-fstrict-aliasing', '-fno-common' compile_args = ['-O3', '-w', '-fopenmp', '-march=native'] # Sometimes worth testing with '-fstrict-aliasing', '-fno-common'
linker_args = ['-fopenmp', '-Wl,-rpath,' + rpath] linker_args = ['-fopenmp', '-Wl,-rpath,' + rpath]
libraries = ['iomp5', 'pthread']
extra_objects = [] extra_objects = []
# Linux # Linux
elif sys.platform == 'linux': elif sys.platform == 'linux':
compile_args = ['-O3', '-w', '-fopenmp', '-march=native'] compile_args = ['-O3', '-w', '-fopenmp', '-march=native']
linker_args = ['-fopenmp'] linker_args = ['-fopenmp']
extra_objects = [] extra_objects = []
libraries=[]
# Build a list of all the extensions # Build a list of all the extensions
extensions = [] extensions = []
@@ -143,6 +147,7 @@ for file in cythonfiles:
[tmp[0] + fileext], [tmp[0] + fileext],
language='c', language='c',
include_dirs=[np.get_include()], include_dirs=[np.get_include()],
libraries=libraries,
extra_compile_args=compile_args, extra_compile_args=compile_args,
extra_link_args=linker_args, extra_link_args=linker_args,
extra_objects=extra_objects) extra_objects=extra_objects)