diff --git a/features/config/TEMPLATE_image_skip_cpu_gpu.xml b/features/config/TEMPLATE_image_skip_cpu_gpu.xml
deleted file mode 100644
index fa8b32e6e..000000000
--- a/features/config/TEMPLATE_image_skip_cpu_gpu.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- test
-
-
-
-
-
-
-
-
-
diff --git a/features/feature_case/image/text_experimental_build_only.cu b/features/feature_case/image/text_experimental_build_only.cu
index 0adf49918..2cfc1805f 100644
--- a/features/feature_case/image/text_experimental_build_only.cu
+++ b/features/feature_case/image/text_experimental_build_only.cu
@@ -56,7 +56,7 @@ void Runtime_MemoryManagement() {
void Runtime_TextureObjectManagement() {
int i = 1;
cudaChannelFormatKind k = cudaChannelFormatKindSigned;
- cudaTextureObject_t o{0}; // TODO: need not "{0}".
+ cudaTextureObject_t o;
cudaResourceDesc r;
cudaTextureDesc t;
// cudaResourceViewDesc v; // TODO: need support.
@@ -101,7 +101,7 @@ void Driver_MemoryManagement() {
}
void Driver_TextureObjectManagement() {
- CUtexObject o{0}; // TODO: need not "{0}".
+ CUtexObject o;
CUDA_RESOURCE_DESC R;
CUDA_TEXTURE_DESC T;
// CUDA_RESOURCE_VIEW_DESC V; // TODO: need support.
@@ -116,7 +116,7 @@ int main() {
Runtime_TextureObjectManagement();
Driver_MemoryManagement();
Driver_TextureObjectManagement();
- cudaTextureObject_t tex{0}; // TODO: need not "{0}".
+ cudaTextureObject_t tex;
CppLanguageExtensions_TextureFunctions<<<1, 1>>>(tex);
return 0;
}
diff --git a/features/feature_case/image/text_experimental_obj_array.cu b/features/feature_case/image/text_experimental_obj_array.cu
index a8a06c5f8..fc8889cd7 100644
--- a/features/feature_case/image/text_experimental_obj_array.cu
+++ b/features/feature_case/image/text_experimental_obj_array.cu
@@ -106,7 +106,7 @@ getTex(cudaArray_t input,
texDesc.filterMode = textureFilterMode;
texDesc.normalizedCoords = normalizedCoords;
- cudaTextureObject_t tex{0}; // TODO: need not "{0}".
+ cudaTextureObject_t tex;
cudaCreateTextureObject(&tex, &resDesc, &texDesc, NULL);
return tex;
diff --git a/features/feature_case/image/text_experimental_obj_linear.cu b/features/feature_case/image/text_experimental_obj_linear.cu
index faae74543..b31b9aa42 100644
--- a/features/feature_case/image/text_experimental_obj_linear.cu
+++ b/features/feature_case/image/text_experimental_obj_linear.cu
@@ -74,7 +74,7 @@ cudaTextureObject_t getTex(void *input, cudaChannelFormatDesc desc,
cudaTextureDesc texDesc;
memset(&texDesc, 0, sizeof(texDesc));
- cudaTextureObject_t tex{0}; // TODO: need not "{0}".
+ cudaTextureObject_t tex;
cudaCreateTextureObject(&tex, &resDesc, &texDesc, NULL);
return tex;
diff --git a/features/feature_case/image/text_experimental_obj_pitch2d.cu b/features/feature_case/image/text_experimental_obj_pitch2d.cu
index 9c5c0587f..5a70dd1aa 100644
--- a/features/feature_case/image/text_experimental_obj_pitch2d.cu
+++ b/features/feature_case/image/text_experimental_obj_pitch2d.cu
@@ -116,7 +116,7 @@ getTex(void *input, size_t w, size_t h, cudaChannelFormatDesc desc,
texDesc.filterMode = textureFilterMode;
texDesc.normalizedCoords = normalizedCoords;
- cudaTextureObject_t tex{0}; // TODO: need not "{0}".
+ cudaTextureObject_t tex;
cudaCreateTextureObject(&tex, &resDesc, &texDesc, NULL);
return tex;
diff --git a/features/features.xml b/features/features.xml
index d3994770d..49826a9c5 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -309,9 +309,9 @@
-
-
-
+
+
+
diff --git a/features/test_feature.py b/features/test_feature.py
index 5b276310a..c507e3887 100644
--- a/features/test_feature.py
+++ b/features/test_feature.py
@@ -42,7 +42,6 @@
'cudnn-GetErrorString', 'cub_device_histgram', 'peer_access',
'cudnn-types', 'cudnn-version', 'cudnn-dropout', 'const_opt',
'constant_attr', 'sync_warp_p2', 'occupancy_calculation',
- 'text_experimental_obj_array', 'text_experimental_obj_linear', 'text_experimental_obj_pitch2d',
'text_obj_array', 'text_obj_linear', 'text_obj_pitch2d', 'match',
'thrust-unique_by_key', 'cufft_test', 'cufft-external-workspace', "pointer_attributes", 'math_intel_specific', 'math-drcp', 'thrust-pinned-allocator', 'driverMem',
'cusolver_test1', 'cusolver_test2', 'cusolver_test3', 'cusolver_test4', 'cusolver_test5', 'thrust_op', 'cublas-extension', 'cublas_v1_runable', 'thrust_minmax_element',
@@ -195,6 +194,8 @@ def build_test():
ret = compile_and_link(srcs, cmp_options, objects, link_opts)
elif re.match('^cufft.*', test_config.current_test) and platform.system() == 'Linux':
ret = compile_and_link(srcs, cmp_options, objects, link_opts)
+ elif test_config.current_test.startswith('text_experimental_obj_') and test_config.device_filter == "cuda:gpu":
+ ret = compile_and_link(srcs, cmp_options, objects, link_opts)
else:
ret = compile_files(srcs, cmp_options)
return ret