Skip to content
Snippets Groups Projects
Commit 6aace600 authored by Stephan Seitz's avatar Stephan Seitz
Browse files

Let all Tensorflow compilation test pass by using different function

names
parent 5782627b
Branches
Tags
No related merge requests found
Pipeline #17927 failed
...@@ -108,9 +108,9 @@ def test_native_tensorflow_compilation_gpu(): ...@@ -108,9 +108,9 @@ def test_native_tensorflow_compilation_gpu():
backward_assignments = create_backward_assignments(forward_assignments) backward_assignments = create_backward_assignments(forward_assignments)
forward_ast = pystencils.create_kernel(forward_assignments, target) forward_ast = pystencils.create_kernel(forward_assignments, target)
forward_ast.function_name = 'forward' forward_ast.function_name = 'forward2'
backward_ast = pystencils.create_kernel(backward_assignments, target) backward_ast = pystencils.create_kernel(backward_assignments, target)
backward_ast.function_name = 'backward' backward_ast.function_name = 'backward2'
module = TensorflowModule(module_name, [forward_ast, backward_ast]) module = TensorflowModule(module_name, [forward_ast, backward_ast])
print(str(module)) print(str(module))
...@@ -144,10 +144,10 @@ def test_native_tensorflow_compilation_gpu(): ...@@ -144,10 +144,10 @@ def test_native_tensorflow_compilation_gpu():
# command = ['clang-7', '-shared', temp_file.name, '--cuda-path=/usr/include', '-std=c++14', # command = ['clang-7', '-shared', temp_file.name, '--cuda-path=/usr/include', '-std=c++14',
# '-fPIC', '-lcudart', '-o', 'foo.so'] + compile_flags + link_flags + extra_flags # '-fPIC', '-lcudart', '-o', 'foo.so'] + compile_flags + link_flags + extra_flags
command = ['c++', '-fPIC', '-lcudart', 'foo_gpu.o', command = ['c++', '-fPIC', '-lcudart', 'foo_gpu.o',
'-shared', '-o', 'foo.so'] + link_flags '-shared', '-o', 'foo_gpu.so'] + link_flags
subprocess.check_call(command) subprocess.check_call(command)
lib = tf.load_op_library(join(os.getcwd(), 'foo.so')) lib = tf.load_op_library(join(os.getcwd(), 'foo_gpu.so'))
assert 'call_forward' in dir(lib) assert 'call_forward2' in dir(lib)
assert 'call_backward' in dir(lib) assert 'call_backward2' in dir(lib)
...@@ -17,13 +17,13 @@ from pystencils_autodiff import create_backward_assignments ...@@ -17,13 +17,13 @@ from pystencils_autodiff import create_backward_assignments
from pystencils_autodiff.backends.astnodes import TensorflowModule from pystencils_autodiff.backends.astnodes import TensorflowModule
def test_tensorflow_jit_cpu(): def test_tensorflow_jit_gpu():
pytest.importorskip('tensorflow') pytest.importorskip('tensorflow')
module_name = "Ololol" module_name = "Ololols"
target = 'cpu' target = 'gpu'
z, y, x = pystencils.fields("z, y, x: [20,40]") z, y, x = pystencils.fields("z, y, x: [20,40]")
a = sympy.Symbol('a') a = sympy.Symbol('a')
...@@ -35,23 +35,23 @@ def test_tensorflow_jit_cpu(): ...@@ -35,23 +35,23 @@ def test_tensorflow_jit_cpu():
backward_assignments = create_backward_assignments(forward_assignments) backward_assignments = create_backward_assignments(forward_assignments)
forward_ast = pystencils.create_kernel(forward_assignments, target) forward_ast = pystencils.create_kernel(forward_assignments, target)
forward_ast.function_name = 'forward' forward_ast.function_name = 'forward_jit_gpu' # must be different from CPU names
backward_ast = pystencils.create_kernel(backward_assignments, target) backward_ast = pystencils.create_kernel(backward_assignments, target)
backward_ast.function_name = 'backward' backward_ast.function_name = 'backward_jit_gpu'
module = TensorflowModule(module_name, [forward_ast, backward_ast]) module = TensorflowModule(module_name, [forward_ast, backward_ast])
lib = pystencils_autodiff.tensorflow_jit.compile_sources_and_load([str(module)]) lib = pystencils_autodiff.tensorflow_jit.compile_sources_and_load([], [str(module)])
assert 'call_forward' in dir(lib) assert 'call_forward_jit_gpu' in dir(lib)
assert 'call_backward' in dir(lib) assert 'call_backward_jit_gpu' in dir(lib)
def test_tensorflow_jit_gpu(): def test_tensorflow_jit_cpu():
pytest.importorskip('tensorflow') pytest.importorskip('tensorflow')
module_name = "Ololol" module_name = "Ololol"
target = 'gpu' target = 'cpu'
z, y, x = pystencils.fields("z, y, x: [20,40]") z, y, x = pystencils.fields("z, y, x: [20,40]")
a = sympy.Symbol('a') a = sympy.Symbol('a')
...@@ -63,12 +63,11 @@ def test_tensorflow_jit_gpu(): ...@@ -63,12 +63,11 @@ def test_tensorflow_jit_gpu():
backward_assignments = create_backward_assignments(forward_assignments) backward_assignments = create_backward_assignments(forward_assignments)
forward_ast = pystencils.create_kernel(forward_assignments, target) forward_ast = pystencils.create_kernel(forward_assignments, target)
forward_ast.function_name = 'forward' forward_ast.function_name = 'forward_jit'
backward_ast = pystencils.create_kernel(backward_assignments, target) backward_ast = pystencils.create_kernel(backward_assignments, target)
backward_ast.function_name = 'backward' backward_ast.function_name = 'backward_jit'
module = TensorflowModule(module_name, [forward_ast, backward_ast]) module = TensorflowModule(module_name, [forward_ast, backward_ast])
lib = pystencils_autodiff.tensorflow_jit.compile_sources_and_load([], [str(module)]) lib = pystencils_autodiff.tensorflow_jit.compile_sources_and_load([str(module)])
assert 'call_forward' in dir(lib) assert 'call_forward_jit' in dir(lib)
assert 'call_backward' in dir(lib) assert 'call_backward_jit' in dir(lib)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment