added guard clause generation
Some checks failed
CI / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} (x64, ubuntu-latest, 1.10) (push) Has been cancelled
CI / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} (x64, ubuntu-latest, 1.6) (push) Has been cancelled
CI / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} (x64, ubuntu-latest, pre) (push) Has been cancelled
CompatHelper / CompatHelper (push) Has been cancelled
Some checks failed
CI / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} (x64, ubuntu-latest, 1.10) (push) Has been cancelled
CI / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} (x64, ubuntu-latest, 1.6) (push) Has been cancelled
CI / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} (x64, ubuntu-latest, pre) (push) Has been cancelled
CompatHelper / CompatHelper (push) Has been cancelled
This commit is contained in:
@ -25,17 +25,7 @@ function testHelper(expression::Expr, variables::Matrix{Float64}, parameters::Ve
|
||||
@test isequal(result[1,1], expectedResult)
|
||||
end
|
||||
|
||||
@testset "Test TMP interpretation" begin
|
||||
postfixExpr = expr_to_postfix(expressions[1])
|
||||
postfixExprs = Vector([postfixExpr])
|
||||
push!(postfixExprs, expr_to_postfix(expressions[2]))
|
||||
|
||||
# CUDA.@sync interpret(postfixExprs, variables, parameters)
|
||||
end
|
||||
|
||||
@testset "Test conversion to matrix" begin
|
||||
return
|
||||
|
||||
reference = Matrix{Float64}(undef, 2, 2)
|
||||
reference[1,1] = 5.0
|
||||
reference[2,1] = NaN64
|
||||
@ -43,14 +33,12 @@ end
|
||||
reference[2,2] = 0.0
|
||||
# reference = Matrix([5.0, NaN],
|
||||
# [5.0, 0.0])
|
||||
CUDA.@sync result = Interpreter.convert_to_matrix(parameters, NaN64)
|
||||
result = Interpreter.convert_to_matrix(parameters, NaN64)
|
||||
|
||||
@test isequal(result, reference)
|
||||
end
|
||||
|
||||
@testset "Test commutative interpretation" begin
|
||||
return
|
||||
|
||||
var = Matrix{Float64}(undef, 2, 1)
|
||||
param = Vector{Vector{Float64}}(undef, 1)
|
||||
expectedResult = 8.0 # Not using "eval" because the variables are not stored in global scope
|
||||
@ -71,8 +59,6 @@ end
|
||||
end
|
||||
|
||||
@testset "Test non commutative interpretation" begin
|
||||
return
|
||||
|
||||
var = Matrix{Float64}(undef, 2, 1)
|
||||
param = Vector{Vector{Float64}}(undef, 1)
|
||||
expectedResult = -2.0 # Not using "eval" because the variables are not stored in global scope
|
||||
@ -103,8 +89,6 @@ end
|
||||
end
|
||||
|
||||
@testset "Test single value operator interpretation" begin
|
||||
return
|
||||
|
||||
var = Matrix{Float64}(undef, 1, 1)
|
||||
param = Vector{Vector{Float64}}(undef, 1)
|
||||
expectedResult = 3.0 # Not using "eval" because the variables are not stored in global scope
|
||||
|
32
package/test/TranspilerTests.jl
Normal file
32
package/test/TranspilerTests.jl
Normal file
@ -0,0 +1,32 @@
|
||||
using CUDA
|
||||
using .ExpressionProcessing
|
||||
using .Transpiler
|
||||
|
||||
expressions = Vector{Expr}(undef, 2)
|
||||
variables = Matrix{Float64}(undef, 2,2)
|
||||
parameters = Vector{Vector{Float64}}(undef, 2)
|
||||
|
||||
# Resulting value should be 10 for the first expression
|
||||
expressions[1] = :(x1 + 1 * x2 + p1)
|
||||
expressions[2] = :(5 + x1 + 1 * x2 + p1 + p2)
|
||||
variables[1,1] = 2.0
|
||||
variables[2,1] = 3.0
|
||||
variables[1,2] = 0.0
|
||||
variables[2,2] = 5.0
|
||||
parameters[1] = Vector{Float64}(undef, 1)
|
||||
parameters[2] = Vector{Float64}(undef, 2)
|
||||
parameters[1][1] = 5.0
|
||||
parameters[2][1] = 5.0
|
||||
parameters[2][2] = 0.0
|
||||
|
||||
|
||||
@testset "Test TMP transpiler" begin
|
||||
postfixExpr = expr_to_postfix(expressions[1])
|
||||
postfixExprs = Vector([postfixExpr])
|
||||
push!(postfixExprs, expr_to_postfix(expressions[2]))
|
||||
|
||||
Transpiler.transpile(postfixExpr)
|
||||
# CUDA.@sync interpret(postfixExprs, variables, parameters)
|
||||
end
|
||||
|
||||
#TODO: test performance of transpiler PTX generation when doing "return String(take!(buffer))" vs "return take!(buffer)"
|
@ -4,8 +4,10 @@ using Test
|
||||
const baseFolder = dirname(dirname(pathof(ExpressionExecutorCuda)))
|
||||
include(joinpath(baseFolder, "src", "ExpressionProcessing.jl"))
|
||||
include(joinpath(baseFolder, "src", "Interpreter.jl"))
|
||||
include(joinpath(baseFolder, "src", "Transpiler.jl"))
|
||||
|
||||
@testset "ExpressionExecutorCuda.jl" begin
|
||||
include("ExpressionProcessingTests.jl")
|
||||
include("InterpreterTests.jl")
|
||||
include("TranspilerTests.jl")
|
||||
end
|
||||
|
Reference in New Issue
Block a user