Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Replace LuaBinaries files with self-compiled Lua libraries. Also do some cleanup and fixes. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: | d0702e682c7fb9d9e9b9bd57e124412701087575 |
User & Date: | vadim 2018-05-16 06:42:36 |
Context
2018-05-21
| ||
11:09 | Remove cross-calls to FX.Core API functions. check-in: c16754483f user: vadim tags: trunk | |
2018-05-16
| ||
06:42 | Replace LuaBinaries files with self-compiled Lua libraries. Also do some cleanup and fixes. check-in: d0702e682c user: vadim tags: trunk | |
2018-05-15
| ||
12:13 | Another test. check-in: 8188e952f3 user: vadim tags: trunk | |
Changes
Changes to CMakeLists.txt.
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
..
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
endif()
find_package(Lua51 REQUIRED)
# By default, debug configuration is compiled
if(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
set (LFLAGS "-mkl -static-intel")
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set (FCFLAGS "-fp-model precise -xHOST -O2")
else()
set (FCFLAGS "-fp-model precise -g -O0 -C -traceback")
endif()
set (FCFLAGS90 "-warn")
elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
if(MINGW)
# set (LFLAGS "-static-libgcc -static-libgfortran -Wl,-s")
set (LFLAGS "-static-libgcc -static-libgfortran")
else()
set (LFLAGS "")
endif()
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set (FCFLAGS "-O2 -march=native -mfpmath=sse")
else()
set (FCFLAGS "-g -O0 -fcheck=all -fbacktrace -frecursive")
endif()
set (FCFLAGS90 "-Wall")
................................................................................
add_library(ftnlf STATIC ${src_lib})
set_target_properties(ftnlf PROPERTIES COMPILE_FLAGS "${FCFLAGS} ${FCFLAGS90}")
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set_target_properties(ftnlf PROPERTIES INTERPROCEDURAL_OPTIMIZATION 1)
endif()
add_library(FX SHARED ${src_shlib})
set_target_properties(FX PROPERTIES COMPILE_FLAGS "${FCFLAGS} ${FCFLAGS90}")
set_target_properties(FX PROPERTIES PREFIX "")
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set_target_properties(FX PROPERTIES INTERPROCEDURAL_OPTIMIZATION 1)
endif()
add_executable(ftnlf_test ${src_test})
# Link static
|
>
|
>
>
>
>
>
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
..
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
endif() find_package(Lua51 REQUIRED) # By default, debug configuration is compiled if(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel") set (LFLAGS "-mkl -static-intel") set (LFLAGS_FX "") if(CMAKE_BUILD_TYPE STREQUAL "Release") set (FCFLAGS "-fp-model precise -xHOST -O2") else() set (FCFLAGS "-fp-model precise -g -O0 -C -traceback") endif() set (FCFLAGS90 "-warn") elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") if(MINGW) # set (LFLAGS "-static-libgcc -static-libgfortran -Wl,-s") # set (LFLAGS "-static-libgcc -static-libgfortran") set (LFLAGS "") set (LFLAGS_FX ${LFLAGS}) else() set (LFLAGS "") set (LFLAGS_FX "") endif() if(CMAKE_BUILD_TYPE STREQUAL "Release") set (FCFLAGS "-O2 -march=native -mfpmath=sse") else() set (FCFLAGS "-g -O0 -fcheck=all -fbacktrace -frecursive") endif() set (FCFLAGS90 "-Wall") ................................................................................ add_library(ftnlf STATIC ${src_lib}) set_target_properties(ftnlf PROPERTIES COMPILE_FLAGS "${FCFLAGS} ${FCFLAGS90}") if(CMAKE_BUILD_TYPE STREQUAL "Release") set_target_properties(ftnlf PROPERTIES INTERPROCEDURAL_OPTIMIZATION 1) endif() add_library(FX SHARED ${src_shlib}) target_link_libraries(FX ${LUA_LIBRARIES}) set_target_properties(FX PROPERTIES COMPILE_FLAGS "${FCFLAGS} ${FCFLAGS90}") set_target_properties(FX PROPERTIES LINK_FLAGS "${LFLAGS_FX}") set_target_properties(FX PROPERTIES PREFIX "") if(CMAKE_BUILD_TYPE STREQUAL "Release") set_target_properties(FX PROPERTIES INTERPROCEDURAL_OPTIMIZATION 1) endif() add_executable(ftnlf_test ${src_test}) # Link static |
Deleted ftnlf_fxcore_shared.f90.
1 2 3 4 5 6 7 8 9 10 |
function luaopen_fx_core(L) bind(C, name='luaopen_FX_Core') result(r) use LuaF use ftnlf_fxcore, only: ldr_fx_core use, intrinsic :: iso_c_binding, only: c_int, c_ptr type(c_ptr), value, intent(in) :: L integer(c_int) :: r r = ldr_fx_core(L) end function luaopen_fx_core |
< < < < < < < < < < |
Added intel/LICENSE_Lua.txt.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 |
Lua License ----------- Lua is licensed under the terms of the MIT license reproduced below. This means that Lua is free software and can be used for both academic and commercial purposes at absolutely no cost. For details and rationale, see http://www.lua.org/license.html . =============================================================================== Copyright (C) 1994-2012 Lua.org, PUC-Rio. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. =============================================================================== (end of COPYRIGHT) |
Deleted intel/LICENSE_luabinaries.txt.
1 2 3 4 5 6 7 8 9 10 |
This is the license for files: lua5.1.dll lua5.1_32.lib lua5.1_64.lib Copyright © 2005-2012 Tecgraf/PUC-Rio and the Kepler Project. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
< < < < < < < < < < |
Changes to intel/c.cmd.
1 2 3 4 5 |
call "C:\Program Files\Intel\Composer XE 2011 SP1\bin\ipsxe-comp-vars.bat" ia32 vs2010
ifort /c /QxHOST /O2 /C /traceback /warn ..\luaf\luaf.f90 ..\luaf\luafe.f90 ..\ftnlf_fxcore.f90 ..\ftnlf.f90
lib /out:ftnlf.lib *.obj
ifort /QxHOST /O2 /C /traceback /warn ..\test.f90 /exe:ftnlf_test.exe ftnlf.lib lua5.1_32.lib
del *.obj
|
| |
1 2 3 4 5 |
call "C:\Program Files\Intel\Composer XE 2011 SP1\bin\ipsxe-comp-vars.bat" ia32 vs2010 ifort /c /QxHOST /O2 /C /traceback /warn ..\luaf\luaf.f90 ..\luaf\luafe.f90 ..\ftnlf_fxcore.f90 ..\ftnlf.f90 lib /out:ftnlf.lib *.obj ifort /QxHOST /O2 /C /traceback /warn ..\test.f90 /exe:ftnlf_test.exe ftnlf.lib lua51_32.lib del *.obj |
Changes to intel/clib.cmd.
1 2 3 4 5 6 |
call "C:\Program Files\Intel\Composer XE 2011 SP1\bin\ipsxe-comp-vars.bat" ia32 vs2010 ifort /c /QxHOST /O2 /warn ..\luaf\luaf.f90 ..\luaf\luafe.f90 ..\ftnlf_fxcore.f90 ..\ftnlf.f90 lib /out:ftnlf.lib *.obj ifort /c /QxHOST /O2 /warn ..\ftnlf_fxcore_shared.f90 ifort /dll /exe:FX.dll ftnlf_fxcore_shared.obj luaf.obj luafe.obj ftnlf_fxcore.obj lua5.1_32.lib FX.def del *.obj |
< | |
1 2 3 4 5 |
call "C:\Program Files\Intel\Composer XE 2011 SP1\bin\ipsxe-comp-vars.bat" ia32 vs2010 ifort /c /QxHOST /O2 /warn ..\luaf\luaf.f90 ..\luaf\luafe.f90 ..\ftnlf_fxcore.f90 ..\ftnlf.f90 lib /out:ftnlf.lib *.obj ifort /dll /exe:FX.dll luaf.obj luafe.obj ftnlf_fxcore.obj lua51_32.lib FX.def del *.obj |
Deleted intel/lua5.1.dll.
cannot compute difference between binary files
Deleted intel/lua5.1_32.lib.
cannot compute difference between binary files
Deleted intel/lua5.1_64.lib.
cannot compute difference between binary files
Added intel/lua51.dll.
cannot compute difference between binary files
Added intel/lua51_32.lib.
cannot compute difference between binary files