Commit 3b2a85ac authored by Paal Kvamme's avatar Paal Kvamme
Browse files

Merge branch 'kvamme62/devops' into 'master'

Some minor canges to the build scripts.

See merge request !52
parents e15343e1 2117dc94
Pipeline #31108 passed with stages
in 8 minutes and 36 seconds
......@@ -7,18 +7,17 @@ parameters:
steps:
- checkout: self
clean: true
path: s
- bash: |
rm -rf seismic-service-bin
git clone "https://$SYSTEM_ACCESSTOKEN@dev.azure.com/slb-swt/Colors/_git/seismic-service-bin" seismic-service-bin
pwd
ls
ls seismic-service-bin
condition: and(succeeded(), or(contains('${{parameters.makeargs}}', 'SDAPI_INTERNAL=ON'), contains('${{parameters.makeargs}}', 'SDAPI_OSDU=ON')))
- checkout: git://Colors/seismic-service-bin
path: s/seismic-service-bin
displayName: 'Checkout additional (binary) sources'
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
- bash: |
echo files in `pwd`
ls -FC
test ! -d seismic-service-bin/. || echo files in `pwd`/seismic-service-bin
test ! -d seismic-service-bin/. || ls -FC seismic-service-bin
displayName: 'Show sources'
- bash: |
test ! -x private/showtoken.py || private/showtoken.py OPENZGY_TOKEN
......
......@@ -33,7 +33,7 @@ module1 = Extension('sdglue',
sources = ['sdgluemodule.cpp'],
include_dirs = ['../../build/temp/Seismic-Drive/include'],
library_dirs = ['../../build/temp/Seismic-Drive/lib/linux64'],
runtime_library_dirs = ['$ORIGIN/sdapihack'],
runtime_library_dirs = ['$ORIGIN/sdapilibs'],
extra_compile_args = ['-fopenmp', '-std=c++11', '-O2'],
extra_link_args = ['-fopenmp', '-Wl,-z,origin'])
......@@ -43,9 +43,9 @@ setup (name = 'SdGlue',
"Programming Language :: C++ :: 11",
"License :: OSI Approved :: Apache Software License",
],
packages = ['sdapihack'],
package_dir = {'sdapihack': '../../build/temp/Seismic-Drive/lib/linux64'},
package_data = {'sdapihack': ['libsdapi.so*']},
packages = ['sdapilibs'],
package_dir = {'sdapilibs': '../../build/temp/Seismic-Drive/lib/linux64'},
package_data = {'sdapilibs': ['libsdapi.so*']},
version = version,
description = 'Python wrapper for C++ SDAPI',
#author='',
......
......@@ -23,10 +23,10 @@ As is standard in Python, you can also get help on individual classes and indivi
help(openzgy.api.ZgyReader.read)
If you install the binary "SdZhzGlue" Python module you will also be able to read and write sd:// uris using seismic store.
If you install the binary "SdGlue" Python module you will also be able to read and write sd:// uris using seismic store.
pip3 install SdZhzGlue-*.whl
pip3 install SdGlue-*.whl
Unlike the core OpenZGY, this library will need to match your OS and Pyhon version. The build server supports 10 or so combinations of Linux and Python. No windows support yet. As for the module name... don't ask.
Unlike the core OpenZGY, this library will need to match your OS and Pyhon version. The build server supports 10 or so combinations of Linux and Python. No windows support yet.
If you install ZFP version 0.5.5 you will be able to read and write compressed files. You may need to build that library from source. ZFP is open source, but I haven't found any repo that has pre-built Python packages for it.
Supports Markdown
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