forked from easybuilders/easybuild-easyconfigs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Orient
committed
Oct 6, 2023
1 parent
50c04c2
commit 21b2c3a
Showing
1 changed file
with
22 additions
and
22 deletions.
There are no files selected for viewing
44 changes: 22 additions & 22 deletions
44
easybuild/easyconfigs/r/ResistanceGA/JuliaCall-0.17.5-top_level_macro.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,22 @@ | ||
| There is an error in current JuliaCall, which should be patched in upcoming versions. | ||
| See https://github.com/Non-Contradiction/JuliaCall/issues/203 | ||
| diff -ruN JuliaCall_orig/inst/julia/JuliaObject.jl JuliaCall/inst/julia/JuliaObject.jl | ||
| --- JuliaCall_orig/inst/julia/JuliaObject.jl 2022-09-07 18:13:31.000000000 +0200 | ||
| +++ JuliaCall/inst/julia/JuliaObject.jl 2023-09-26 17:29:44.310679473 +0200 | ||
| @@ -74,14 +74,14 @@ | ||
| ## we should use JuliaObject for general AbstractArray | ||
| @static if julia07 | ||
| @suppress_err begin | ||
| - JuliaCall.sexpclass(x :: AbstractArray{T}) where {T} = RClass{:JuliaObject} | ||
| + @eval JuliaCall.sexpclass(x :: AbstractArray{T}) where {T} = RClass{:JuliaObject} | ||
| end | ||
|
|
||
| ## AbstractArray{Any} should be converted to R List | ||
| sexpclass(x :: AbstractArray{Any}) = RClass{:list} | ||
| else | ||
| @suppress_err begin | ||
| - JuliaCall.sexp(x :: AbstractArray{T}) where {T} = sexp(JuliaObject(x)) | ||
| + @eval JuliaCall.sexp(x :: AbstractArray{T}) where {T} = sexp(JuliaObject(x)) | ||
| end | ||
|
|
||
| ## AbstractArray{Any} should be converted to R List | ||
| There is an error in current JuliaCall, which should be patched in upcoming versions. | ||
| See https://github.com/Non-Contradiction/JuliaCall/issues/203 | ||
| diff -ruN JuliaCall_orig/inst/julia/JuliaObject.jl JuliaCall/inst/julia/JuliaObject.jl | ||
| --- JuliaCall_orig/inst/julia/JuliaObject.jl 2022-09-07 18:13:31.000000000 +0200 | ||
| +++ JuliaCall/inst/julia/JuliaObject.jl 2023-09-26 17:29:44.310679473 +0200 | ||
| @@ -74,14 +74,14 @@ | ||
| ## we should use JuliaObject for general AbstractArray | ||
| @static if julia07 | ||
| @suppress_err begin | ||
| - JuliaCall.sexpclass(x :: AbstractArray{T}) where {T} = RClass{:JuliaObject} | ||
| + @eval JuliaCall.sexpclass(x :: AbstractArray{T}) where {T} = RClass{:JuliaObject} | ||
| end | ||
|
|
||
| ## AbstractArray{Any} should be converted to R List | ||
| sexpclass(x :: AbstractArray{Any}) = RClass{:list} | ||
| else | ||
| @suppress_err begin | ||
| - JuliaCall.sexp(x :: AbstractArray{T}) where {T} = sexp(JuliaObject(x)) | ||
| + @eval JuliaCall.sexp(x :: AbstractArray{T}) where {T} = sexp(JuliaObject(x)) | ||
| end | ||
|
|
||
| ## AbstractArray{Any} should be converted to R List |