Commit 0eb622c7 authored by Jim King's avatar Jim King
Browse files

Merge remote-tracking branch 'origin/master' into feature/jim.king/plugin_port_main2

parents 88ead152 2079b89f
...@@ -8,12 +8,13 @@ set (CMAKE_CXX_STANDARD_REQUIRED ON) ...@@ -8,12 +8,13 @@ set (CMAKE_CXX_STANDARD_REQUIRED ON)
include_directories(${dmsCMakeDir}/src/core) include_directories(${dmsCMakeDir}/src/core)
include_directories(${dmsCMakeDir}/src/lib) include_directories(${dmsCMakeDir}/src/lib)
include_directories(${dmsCMakeDir}/src/lib/cloud)
include_directories(${dmsCMakeDir}/src/lib/cloud/providers) include_directories(${dmsCMakeDir}/src/lib/cloud/providers)
include_directories(${dmsCMakeDir}/src/lib/cloud/providers/gcs-accessor)
# retrieve sources # retrieve sources
file(GLOB SRC_CORE ${dmsCMakeDir}/src/core/*.cc) file(GLOB SRC_CORE ${dmsCMakeDir}/src/core/*.cc)
file(GLOB SRC_LIB_ACCESSORS ${dmsCMakeDir}/src/lib/accessors/*.cc) file(GLOB SRC_LIB_PROVIDERS ${dmsCMakeDir}/src/lib/cloud/*.cc ${dmsCMakeDir}/src/lib/cloud/providers/gcs-accessor/*.cc)
file(GLOB SRC_LIB_PROVIDERS ${dmsCMakeDir}/src/lib/cloud/providers/*.cc)
file(GLOB SRC_LIB_HTTP ${dmsCMakeDir}/src/lib/http/*.cc) file(GLOB SRC_LIB_HTTP ${dmsCMakeDir}/src/lib/http/*.cc)
file(GLOB SRC_LIB_JSON ${dmsCMakeDir}/src/lib/json/*.cpp) file(GLOB SRC_LIB_JSON ${dmsCMakeDir}/src/lib/json/*.cpp)
file(GLOB SRC_LIB_AUTH ${dmsCMakeDir}/src/lib/auth/*.cc) file(GLOB SRC_LIB_AUTH ${dmsCMakeDir}/src/lib/auth/*.cc)
...@@ -48,6 +49,13 @@ if (NOT DISABLE_AWS_IOMANAGER) ...@@ -48,6 +49,13 @@ if (NOT DISABLE_AWS_IOMANAGER)
file(GLOB SRC_LIB_PROVIDERS_IBM ${dmsCMakeDir}/src/lib/cloud/providers/ibm/*.cc) file(GLOB SRC_LIB_PROVIDERS_IBM ${dmsCMakeDir}/src/lib/cloud/providers/ibm/*.cc)
set(SOURCES ${SOURCES} ${SRC_LIB_PROVIDERS_IBM}) set(SOURCES ${SOURCES} ${SRC_LIB_PROVIDERS_IBM})
set_source_files_properties(${dmsCMakeDir}/src/lib/cloud/providers/ibm/IbmStorage.cc PROPERTIES COMPILE_FLAGS ${DISABLE_WARNING_FLAG}) set_source_files_properties(${dmsCMakeDir}/src/lib/cloud/providers/ibm/IbmStorage.cc PROPERTIES COMPILE_FLAGS ${DISABLE_WARNING_FLAG})
#to work around Aws::String problem
#https://github.com/aws/aws-sdk-cpp/blob/266d7682c3d07d41618c41a3521811e1219c1bc7/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSString.h#L21
if (NOT MSVC)
set_property(SOURCE ${dmsCMakeDir}/src/lib/cloud/providers/aws/AwsStorage.cc APPEND_STRING PROPERTY COMPILE_FLAGS " -fvisibility=default")
set_property(SOURCE ${dmsCMakeDir}/src/lib/cloud/providers/ibm/IbmStorage.cc APPEND_STRING PROPERTY COMPILE_FLAGS " -fvisibility=default")
endif()
endif() endif()
# set major library versions # set major library versions
......
...@@ -105,7 +105,7 @@ function(Fetch3rdParty) ...@@ -105,7 +105,7 @@ function(Fetch3rdParty)
Fetch3rdParty_Package(google-cloud-cpp 1.14.0 https://codeload.github.com/googleapis/google-cloud-cpp/tar.gz/v1.14.0 SHA256=839b2d4dcb36a671734dac6b30ea8c298bbeaafcf7a45ee4a7d7aa5986b16569) Fetch3rdParty_Package(google-cloud-cpp 1.14.0 https://codeload.github.com/googleapis/google-cloud-cpp/tar.gz/v1.14.0 SHA256=839b2d4dcb36a671734dac6b30ea8c298bbeaafcf7a45ee4a7d7aa5986b16569)
Fetch3rdParty_Package(libxml2 2.9.12a https://codeload.github.com/GNOME/libxml2/tar.gz/v2.9.12 SHA256=8a4ddd706419c210b30b8978a51388937fd9362c34fc9a3d69e4fcc6f8055ee0) Fetch3rdParty_Package(libxml2 2.9.12a https://codeload.github.com/GNOME/libxml2/tar.gz/v2.9.12 SHA256=8a4ddd706419c210b30b8978a51388937fd9362c34fc9a3d69e4fcc6f8055ee0)
Fetch3rdParty_Package(azure-sdk-for-cpp 12.0.0b11 https://codeload.github.com/Azure/azure-sdk-for-cpp/tar.gz/azure-storage-blobs_12.0.0-beta.11 SHA256=b111636335340e3e7a5675351216dde606b8345b9906ed2f42ff8a794f5f2375) Fetch3rdParty_Package(azure-sdk-for-cpp 12.0.0b11 https://codeload.github.com/Azure/azure-sdk-for-cpp/tar.gz/azure-storage-blobs_12.0.0-beta.11 SHA256=b111636335340e3e7a5675351216dde606b8345b9906ed2f42ff8a794f5f2375)
Fetch3rdParty_Package(dms b015ea6ec https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/seismic/seismic-dms-suite/seismic-store-cpp-lib/-/archive/b015ea6ec113d95d9ca00bb48e0ab76e646c2aea/seismic-store-cpp-lib-master.tar.gz SHA256=77cc6d08a3978bafee309e8b0f43f95431d2154619b140392a7ee0a27985a49c) Fetch3rdParty_Package(dms 11ffc9ca4a https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/seismic/seismic-dms-suite/seismic-store-cpp-lib/-/archive/11ffc9ca4af271449229073ff2a4563104654e12/seismic-store-cpp-lib-master.tar.gz SHA256=1ad3141c4ae07fed14a4b92fd4afae29de3f989fffa67f6e2423f67a54d58e05)
#Fetch3rdParty_Git(dms git git@community.opengroup.org:osdu/platform/domain-data-mgmt-services/seismic/seismic-dms-suite/seismic-store-cpp-lib.git master) #Fetch3rdParty_Git(dms git git@community.opengroup.org:osdu/platform/domain-data-mgmt-services/seismic/seismic-dms-suite/seismic-store-cpp-lib.git master)
Fetch3rdParty_File(testng java 6.14.3 jar https://repo1.maven.org/maven2/org/testng/testng/6.14.3/testng-6.14.3.jar MD5=9f17a8f9e99165e148c42b21f4b63d7c) Fetch3rdParty_File(testng java 6.14.3 jar https://repo1.maven.org/maven2/org/testng/testng/6.14.3/testng-6.14.3.jar MD5=9f17a8f9e99165e148c42b21f4b63d7c)
Fetch3rdParty_File(jcommander java 1.72 jar https://repo1.maven.org/maven2/com/beust/jcommander/1.72/jcommander-1.72.jar MD5=9fde6bc0ba1032eceb7267fd1ad1657b) Fetch3rdParty_File(jcommander java 1.72 jar https://repo1.maven.org/maven2/com/beust/jcommander/1.72/jcommander-1.72.jar MD5=9fde6bc0ba1032eceb7267fd1ad1657b)
......
...@@ -99,6 +99,9 @@ It is the access_token member of the return that will be used as the sdtoken unt ...@@ -99,6 +99,9 @@ It is the access_token member of the return that will be used as the sdtoken unt
NOTE: Key values for `sd` can use `snake_case` instead of `CammelCase` to match the NOTE: Key values for `sd` can use `snake_case` instead of `CammelCase` to match the
look and feel of the response from the token provider. look and feel of the response from the token provider.
If the seismic dms service is targeting AWS, please make sure to set the
AWS_REGION environment variable to the correct region.
``azureSAS`` will accept the following keys ``azureSAS`` will accept the following keys
- Suffix - Suffix
......
...@@ -33,6 +33,15 @@ public class OpenVdsDemo { ...@@ -33,6 +33,15 @@ public class OpenVdsDemo {
} }
static void process(String[] args) throws Exception { static void process(String[] args) throws Exception {
String url = null;
String connection = null;
for (int i = 1; i < args.length; i+=2)
{
if (args[i].equals("--url"))
url = args[i+1];
if (args[i].equals("--connection"))
connection = args[i+1];
}
int output_width = 1000; int output_width = 1000;
int output_height = 1000; int output_height = 1000;
int axis_position = Integer.MIN_VALUE; int axis_position = Integer.MIN_VALUE;
...@@ -41,13 +50,22 @@ public class OpenVdsDemo { ...@@ -41,13 +50,22 @@ public class OpenVdsDemo {
int nXSamples = 64, nYSamples = 64, nZSamples = 64; int nXSamples = 64, nYSamples = 64, nZSamples = 64;
VolumeDataChannelDescriptor.Format format = VolumeDataChannelDescriptor.Format.FORMAT_U8; VolumeDataChannelDescriptor.Format format = VolumeDataChannelDescriptor.Format.FORMAT_U8;
System.out.println("Create MemoryVdsGenerator..."); VdsHandle vds;
MemoryVdsGenerator generator = new MemoryVdsGenerator(nXSamples, nYSamples, nZSamples, format); if (url != null && !url.isEmpty())
{
System.out.println("Open existing VDS with: " + url);
vds = OpenVDS.open(url, connection);
}
else
{
System.out.println("Create MemoryVdsGenerator...");
vds = new MemoryVdsGenerator(nXSamples, nYSamples, nZSamples, format);
}
VolumeDataLayout layout = generator.getLayout(); VolumeDataLayout layout = vds.getLayout();
printLayout(layout); printLayout(layout);
VolumeDataAccessManager accessManager = generator.getAccessManager(); VolumeDataAccessManager accessManager = vds.getAccessManager();
int[] axis_mapper = {0, 1, 2}; int[] axis_mapper = {0, 1, 2};
int[] sampleCount = new int[3]; int[] sampleCount = new int[3];
...@@ -105,7 +123,7 @@ public class OpenVdsDemo { ...@@ -105,7 +123,7 @@ public class OpenVdsDemo {
// Test of finalization. Normally manual call of release() is not needed: // Test of finalization. Normally manual call of release() is not needed:
// it is called from JniPointer.finalize() // it is called from JniPointer.finalize()
System.out.println("Release objects..."); System.out.println("Release objects...");
generator.release(); vds.release();
System.out.println("Finished"); System.out.println("Finished");
} }
......
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