summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref5
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_2848.tst5
-rw-r--r--scilab/modules/core/help/en_US/with_atlas.xml31
-rw-r--r--scilab/modules/core/help/fr_FR/with_atlas.xml31
-rw-r--r--scilab/modules/core/help/ja_JP/with_atlas.xml32
-rw-r--r--scilab/modules/core/help/pt_BR/with_atlas.xml46
-rw-r--r--scilab/modules/core/includes/getversion.h6
-rw-r--r--scilab/modules/core/macros/with_atlas.sci14
-rw-r--r--scilab/modules/core/src/c/core.vcproj8
-rw-r--r--scilab/modules/core/src/c/getstaticDebugInfo_Windows.c297
-rw-r--r--scilab/modules/core/src/c/getversion.c24
-rw-r--r--scilab/modules/helptools/data/configuration/scilab_macros.txt1
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/getBlasType.c65
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/getBlasType.h28
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj8
15 files changed, 270 insertions, 331 deletions
diff --git a/scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref b/scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref
index dbe72c8..3deb425 100644
--- a/scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref
+++ b/scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref
@@ -18,7 +18,6 @@ if c <> [] then bugmes();quit;end
18with_tk(); 18with_tk();
19[a,b,c,d]=completion("with"); 19[a,b,c,d]=completion("with");
20if c <> [] then bugmes();quit;end 20if c <> [] then bugmes();quit;end
21clear with_atlas
22clear with_tk 21clear with_tk
23[a,b,c,d]=completion("with"); 22[a,b,c,d]=completion("with");
24if c <> [] then bugmes();quit;end 23if c <> [] then bugmes();quit;end
@@ -28,8 +27,7 @@ deff("[x] = with_foo(y,z)","x=y+z");
28ref_a = ["with_embedded_jre"; "with_module"]; 27ref_a = ["with_embedded_jre"; "with_module"];
29ref_b = []; 28ref_b = [];
30ref_c = []; 29ref_c = [];
31ref_d = ["with_atlas"; .. 30ref_d = ["with_foo"; ..
32 "with_foo"; ..
33 "with_javasci"; .. 31 "with_javasci"; ..
34 "with_macros_source"; .. 32 "with_macros_source"; ..
35 "with_modelica_compiler"; .. 33 "with_modelica_compiler"; ..
@@ -40,7 +38,6 @@ if or(a <> ref_a) then bugmes();quit;end
40if or(b <> ref_b) then bugmes();quit;end 38if or(b <> ref_b) then bugmes();quit;end
41if or(c <> ref_c) then bugmes();quit;end 39if or(c <> ref_c) then bugmes();quit;end
42if or(d <> ref_d) then bugmes();quit;end 40if or(d <> ref_d) then bugmes();quit;end
43clear with_atlas
44clear with_tk 41clear with_tk
45clear with_foo 42clear with_foo
46[a,b,c,d]=completion("with"); 43[a,b,c,d]=completion("with");
diff --git a/scilab/modules/completion/tests/nonreg_tests/bug_2848.tst b/scilab/modules/completion/tests/nonreg_tests/bug_2848.tst
index 389455a..21b3da8 100644
--- a/scilab/modules/completion/tests/nonreg_tests/bug_2848.tst
+++ b/scilab/modules/completion/tests/nonreg_tests/bug_2848.tst
@@ -24,7 +24,6 @@ with_tk();
24[a,b,c,d]=completion("with"); 24[a,b,c,d]=completion("with");
25if c <> [] then pause,end 25if c <> [] then pause,end
26 26
27clear with_atlas
28clear with_tk 27clear with_tk
29[a,b,c,d]=completion("with"); 28[a,b,c,d]=completion("with");
30if c <> [] then pause,end 29if c <> [] then pause,end
@@ -35,8 +34,7 @@ deff("[x] = with_foo(y,z)","x=y+z");
35ref_a = ["with_embedded_jre"; "with_module"]; 34ref_a = ["with_embedded_jre"; "with_module"];
36ref_b = []; 35ref_b = [];
37ref_c = []; 36ref_c = [];
38ref_d = ["with_atlas"; .. 37ref_d = ["with_foo"; ..
39 "with_foo"; ..
40 "with_javasci"; .. 38 "with_javasci"; ..
41 "with_macros_source"; .. 39 "with_macros_source"; ..
42 "with_modelica_compiler"; .. 40 "with_modelica_compiler"; ..
@@ -50,7 +48,6 @@ if or(c <> ref_c) then pause, end
50if or(d <> ref_d) then pause, end 48if or(d <> ref_d) then pause, end
51 49
52 50
53clear with_atlas
54clear with_tk 51clear with_tk
55clear with_foo 52clear with_foo
56 53
diff --git a/scilab/modules/core/help/en_US/with_atlas.xml b/scilab/modules/core/help/en_US/with_atlas.xml
deleted file mode 100644
index 090e227..0000000
--- a/scilab/modules/core/help/en_US/with_atlas.xml
+++ /dev/null
@@ -1,31 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en" xml:id="with_atlas">
3 <info>
4 <pubdate>$LastChangedDate$</pubdate>
5 </info>
6 <refnamediv>
7 <refname>with_atlas</refname>
8 <refpurpose>Checks if Scilab has been built with
9 Atlas Library</refpurpose>
10 </refnamediv>
11 <refsynopsisdiv>
12 <title>Calling Sequence</title>
13 <synopsis>r=with_atlas()</synopsis>
14 </refsynopsisdiv>
15 <refsection>
16 <title>Arguments</title>
17 <variablelist>
18 <varlistentry>
19 <term>r</term>
20 <listitem>
21 <para>a boolean</para>
22 </listitem>
23 </varlistentry>
24 </variablelist>
25 </refsection>
26 <refsection>
27 <title>Description</title>
28 <para>Returns <literal>%t</literal> if Scilab has been built with Atlas Library or
29 <literal>%f</literal> if not.</para>
30 </refsection>
31</refentry>
diff --git a/scilab/modules/core/help/fr_FR/with_atlas.xml b/scilab/modules/core/help/fr_FR/with_atlas.xml
deleted file mode 100644
index 6c1ebed..0000000
--- a/scilab/modules/core/help/fr_FR/with_atlas.xml
+++ /dev/null
@@ -1,31 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="fr" xml:id="with_atlas">
3 <info>
4 <pubdate>$LastChangedDate$</pubdate>
5 </info>
6 <refnamediv>
7 <refname>with_atlas</refname>
8 <refpurpose>Test si Scilab a ete construit avec la
9 bibliothèque Atlas</refpurpose>
10 </refnamediv>
11 <refsynopsisdiv>
12 <title>Séquence d'appel</title>
13 <synopsis>r=with_atlas()</synopsis>
14 </refsynopsisdiv>
15 <refsection>
16 <title>Paramètres</title>
17 <variablelist>
18 <varlistentry>
19 <term>r</term>
20 <listitem>
21 <para>un booleen</para>
22 </listitem>
23 </varlistentry>
24 </variablelist>
25 </refsection>
26 <refsection>
27 <title>Description</title>
28 <para>retourne <literal>%t</literal> si Scilab a ete construit avec la bibliothèque
29 Atlas ou <literal>%f</literal> si ce n'est pas le cas.</para>
30 </refsection>
31</refentry>
diff --git a/scilab/modules/core/help/ja_JP/with_atlas.xml b/scilab/modules/core/help/ja_JP/with_atlas.xml
deleted file mode 100644
index 8fde01b..0000000
--- a/scilab/modules/core/help/ja_JP/with_atlas.xml
+++ /dev/null
@@ -1,32 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="ja" xml:id="with_atlas">
3 <info>
4 <pubdate>$LastChangedDate$</pubdate>
5 </info>
6 <refnamediv>
7 <refname>with_atlas</refname>
8 <refpurpose>ScilabにAtlasライブラリが組み込まれているかどうかを確認</refpurpose>
9 </refnamediv>
10 <refsynopsisdiv>
11 <title>呼出し手順</title>
12 <synopsis>r=with_atlas()</synopsis>
13 </refsynopsisdiv>
14 <refsection>
15 <title>パラメータ</title>
16 <variablelist>
17 <varlistentry>
18 <term>r</term>
19 <listitem>
20 <para>論理値</para>
21 </listitem>
22 </varlistentry>
23 </variablelist>
24 </refsection>
25 <refsection>
26 <title>説明</title>
27 <para>
28 ScilabにAtlasライブラリが組み込まれている場合に <literal>%t</literal>
29 を返します.
30 そうでない場合に <literal>%f</literal> を返します.</para>
31 </refsection>
32</refentry>
diff --git a/scilab/modules/core/help/pt_BR/with_atlas.xml b/scilab/modules/core/help/pt_BR/with_atlas.xml
deleted file mode 100644
index 29b34a2..0000000
--- a/scilab/modules/core/help/pt_BR/with_atlas.xml
+++ /dev/null
@@ -1,46 +0,0 @@
1<?xml version="1.0" encoding="ISO-8859-1"?>
2<refentry version="5.0-subset Scilab" xml:id="with_atlas" xml:lang="en"
3 xmlns="http://docbook.org/ns/docbook"
4 xmlns:xlink="http://www.w3.org/1999/xlink"
5 xmlns:svg="http://www.w3.org/2000/svg"
6 xmlns:ns3="http://www.w3.org/1999/xhtml"
7 xmlns:mml="http://www.w3.org/1998/Math/MathML"
8 xmlns:db="http://docbook.org/ns/docbook">
9 <info>
10 <pubdate>$LastChangedDate$</pubdate>
11 </info>
12
13 <refnamediv>
14 <refname>with_atlas</refname>
15
16 <refpurpose>Checa se o Scilab foi construdo com a biblioteca
17 "Atlas"</refpurpose>
18 </refnamediv>
19
20 <refsynopsisdiv>
21 <title>Seqncia de Chamamento</title>
22
23 <synopsis>r=with_atlas()</synopsis>
24 </refsynopsisdiv>
25
26 <refsection>
27 <title>Parmetros</title>
28
29 <variablelist>
30 <varlistentry>
31 <term>r</term>
32
33 <listitem>
34 <para>um booleano</para>
35 </listitem>
36 </varlistentry>
37 </variablelist>
38 </refsection>
39
40 <refsection>
41 <title>Descrio</title>
42
43 <para>Retorna <literal>%t</literal> se o Scilab tiver sido construdo com
44 a biblioteca "Atlas", ou <literal>%f</literal> seno.</para>
45 </refsection>
46</refentry>
diff --git a/scilab/modules/core/includes/getversion.h b/scilab/modules/core/includes/getversion.h
index 723fb8a..b837e07 100644
--- a/scilab/modules/core/includes/getversion.h
+++ b/scilab/modules/core/includes/getversion.h
@@ -89,12 +89,6 @@ char *getCompilerUsedToBuildScilab(void);
89char *getCompilerArchitecture(void); 89char *getCompilerArchitecture(void);
90 90
91/** 91/**
92* with atlas ?
93* @return TRUE or FALSE
94*/
95BOOL with_atlas(void);
96
97/**
98* with pvm ? 92* with pvm ?
99* @return TRUE or FALSE 93* @return TRUE or FALSE
100*/ 94*/
diff --git a/scilab/modules/core/macros/with_atlas.sci b/scilab/modules/core/macros/with_atlas.sci
deleted file mode 100644
index fad6265..0000000
--- a/scilab/modules/core/macros/with_atlas.sci
+++ /dev/null
@@ -1,14 +0,0 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) INRIA
3//
4// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which
6// you should have received as part of this distribution. The terms
7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
10function r = with_atlas()
11 warnobsolete("getdebuginfo", "5.4.0");
12 [v, opt] = getversion();
13 r = or(opt == 'atlas');
14endfunction
diff --git a/scilab/modules/core/src/c/core.vcproj b/scilab/modules/core/src/c/core.vcproj
index 7548e01..13f49d7 100644
--- a/scilab/modules/core/src/c/core.vcproj
+++ b/scilab/modules/core/src/c/core.vcproj
@@ -47,7 +47,7 @@
47 AdditionalOptions="" 47 AdditionalOptions=""
48 Optimization="0" 48 Optimization="0"
49 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes" 49 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
50 PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__" 50 PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__"
51 BasicRuntimeChecks="0" 51 BasicRuntimeChecks="0"
52 RuntimeLibrary="3" 52 RuntimeLibrary="3"
53 UsePrecompiledHeader="0" 53 UsePrecompiledHeader="0"
@@ -122,7 +122,7 @@
122 Name="VCCLCompilerTool" 122 Name="VCCLCompilerTool"
123 Optimization="0" 123 Optimization="0"
124 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes" 124 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
125 PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__" 125 PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__"
126 BasicRuntimeChecks="0" 126 BasicRuntimeChecks="0"
127 RuntimeLibrary="3" 127 RuntimeLibrary="3"
128 UsePrecompiledHeader="0" 128 UsePrecompiledHeader="0"
@@ -199,7 +199,7 @@
199 InlineFunctionExpansion="1" 199 InlineFunctionExpansion="1"
200 FavorSizeOrSpeed="1" 200 FavorSizeOrSpeed="1"
201 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes" 201 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
202 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__" 202 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__"
203 StringPooling="true" 203 StringPooling="true"
204 RuntimeLibrary="2" 204 RuntimeLibrary="2"
205 EnableFunctionLevelLinking="true" 205 EnableFunctionLevelLinking="true"
@@ -277,7 +277,7 @@
277 InlineFunctionExpansion="1" 277 InlineFunctionExpansion="1"
278 FavorSizeOrSpeed="1" 278 FavorSizeOrSpeed="1"
279 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes" 279 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
280 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__" 280 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__"
281 StringPooling="true" 281 StringPooling="true"
282 RuntimeLibrary="2" 282 RuntimeLibrary="2"
283 EnableFunctionLevelLinking="true" 283 EnableFunctionLevelLinking="true"
diff --git a/scilab/modules/core/src/c/getstaticDebugInfo_Windows.c b/scilab/modules/core/src/c/getstaticDebugInfo_Windows.c
index 6f2d7e6..5680f38 100644
--- a/scilab/modules/core/src/c/getstaticDebugInfo_Windows.c
+++ b/scilab/modules/core/src/c/getstaticDebugInfo_Windows.c
@@ -1,11 +1,11 @@
1/* 1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2008 - INRIA - Allan CORNET 3 * Copyright (C) 2008 - INRIA - Allan CORNET
4 * 4 *
5 * This file must be used under the terms of the CeCILL. 5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which 6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms 7 * you should have received as part of this distribution. The terms
8 * are also available at 8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 * 10 *
11 */ 11 */
@@ -25,147 +25,176 @@
25#include "getversion.h" 25#include "getversion.h"
26#include "dynamic_tclsci.h" 26#include "dynamic_tclsci.h"
27#include "..\..\..\..\libs\pcre\pcre.h" 27#include "..\..\..\..\libs\pcre\pcre.h"
28#include "getBlasType.h"
28/*--------------------------------------------------------------------------*/ 29/*--------------------------------------------------------------------------*/
29extern BOOL BuildWithVS8ExpressF2C(void); 30extern BOOL BuildWithVS8ExpressF2C(void);
30static char ** appendStringStaticDebugInfo(char **listInfo,int *sizeListInfo,char *str); 31static char ** appendStringStaticDebugInfo(char **listInfo,int *sizeListInfo,char *str);
31/*--------------------------------------------------------------------------*/ 32/*--------------------------------------------------------------------------*/
32char **getStaticDebugInfo_Windows(int *sizeArray) 33char **getStaticDebugInfo_Windows(int *sizeArray)
33{ 34{
34 #define BUFFER_LEN 255 35#define BUFFER_LEN 255
35 int nb_info = 0; 36 int nb_info = 0;
36 char **outputDynamicList = NULL; 37 char **outputDynamicList = NULL;
37 char *str_info = NULL; 38 char *str_info = NULL;
38 39
39 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 40 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
40 if (str_info) 41 if (str_info)
41 { 42 {
42 sprintf(str_info,"Version: %s",SCI_VERSION_STRING); 43 sprintf(str_info,"Version: %s",SCI_VERSION_STRING);
43 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 44 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
44 } 45 }
45 46
46 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 47 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
47 if (str_info) 48 if (str_info)
48 { 49 {
49 sprintf(str_info,"Compilation date: %s",__DATE__); 50 sprintf(str_info,"Compilation date: %s",__DATE__);
50 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 51 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
51 } 52 }
52 53
53 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 54 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
54 if (str_info) 55 if (str_info)
55 { 56 {
56 sprintf(str_info,"Compilation time: %s",__TIME__); 57 sprintf(str_info,"Compilation time: %s",__TIME__);
57 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 58 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
58 } 59 }
59 60
60 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 61 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
61 if (str_info) 62 if (str_info)
62 { 63 {
63 #ifdef _WIN64 64#ifdef _WIN64
64 sprintf(str_info,"Compiler Architecture: %s","X64"); 65 sprintf(str_info,"Compiler Architecture: %s","X64");
65 #else 66#else
66 sprintf(str_info,"Compiler Architecture: %s","x86"); 67 sprintf(str_info,"Compiler Architecture: %s","x86");
67 #endif 68#endif
68 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 69 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
69 } 70 }
70 71
71 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 72 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
72 if (str_info) 73 if (str_info)
73 { 74 {
74 75
75 #ifdef __INTEL_COMPILER 76#ifdef __INTEL_COMPILER
76 sprintf(str_info,"Compiled with %s","Intel compiler"); 77 sprintf(str_info,"Compiled with %s","Intel compiler");
77 #elif defined _MSC_VER 78#elif defined _MSC_VER
78 sprintf(str_info,"Compiled with %s","Microsoft compiler"); 79 sprintf(str_info,"Compiled with %s","Microsoft compiler");
79 #else 80#else
80 sprintf(str_info,"Compiled with %s","unknown compiler"); 81 sprintf(str_info,"Compiled with %s","unknown compiler");
81 #endif 82#endif
82 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 83 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
83 } 84 }
84 85
85 if (BuildWithVS8ExpressF2C()) 86 if (BuildWithVS8ExpressF2C())
86 { 87 {
87 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 88 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
88 if (str_info) 89 if (str_info)
89 { 90 {
90 sprintf(str_info,"Compiled with %s","F2C"); 91 sprintf(str_info,"Compiled with %s","F2C");
91 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 92 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
92 } 93 }
93 } 94 }
94 95
95 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 96 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
96 if (str_info) 97 if (str_info)
97 { 98 {
98 sprintf(str_info,"XML version: %s",LIBXML_DOTTED_VERSION); 99 blas_type blasType = getBlasType();
99 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 100 strcpy(str_info, "BLAS library optimized version: ");
100 } 101 switch (blasType)
101 102 {
102 if ( with_tk() ) 103 default:
103 { 104 case BLAS_UNKNOW:
104 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 105 strcat(str_info, "Unknow");
105 if (str_info) 106 break;
106 { 107
107 sprintf(str_info,"Tcl/Tk: %s","Enable"); 108 case BLAS_REF:
108 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 109 strcat(str_info, "Reference");
109 } 110 break;
110 111
111 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 112 case BLAS_ATLAS:
112 if (str_info) 113 strcat(str_info, "Atlas");
113 { 114 break;
114 sprintf(str_info,"TCL version: %s",TCL_PATCH_LEVEL); 115
115 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 116 case BLAS_MKL:
116 } 117 strcat(str_info, "MKL");
117 118 break;
118 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 119 }
119 if (str_info) 120 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
120 { 121 }
121 sprintf(str_info,"TK version: %s",TK_PATCH_LEVEL); 122
122 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 123
123 } 124 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
124 } 125 if (str_info)
125 126 {
126 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 127 sprintf(str_info,"XML version: %s",LIBXML_DOTTED_VERSION);
127 if (str_info) 128 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
128 { 129 }
129 sprintf(str_info,"Path separator: %s",PATH_SEPARATOR); 130
130 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 131 if ( with_tk() )
131 } 132 {
132 133 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
133 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 134 if (str_info)
134 if (str_info) 135 {
135 { 136 sprintf(str_info,"Tcl/Tk: %s","Enable");
136 sprintf(str_info,"Directory separator: %s",DIR_SEPARATOR); 137 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
137 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 138 }
138 } 139
139 140 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
140 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN); 141 if (str_info)
141 if (str_info) 142 {
142 { 143 sprintf(str_info,"TCL version: %s",TCL_PATCH_LEVEL);
143 sprintf(str_info,"PCRE Version: %d.%d", PCRE_MAJOR,PCRE_MINOR); 144 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
144 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info); 145 }
145 } 146
146 147 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
147 *sizeArray = nb_info; 148 if (str_info)
148 return outputDynamicList; 149 {
150 sprintf(str_info,"TK version: %s",TK_PATCH_LEVEL);
151 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
152 }
153 }
154
155 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
156 if (str_info)
157 {
158 sprintf(str_info,"Path separator: %s",PATH_SEPARATOR);
159 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
160 }
161
162 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
163 if (str_info)
164 {
165 sprintf(str_info,"Directory separator: %s",DIR_SEPARATOR);
166 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
167 }
168
169 str_info = (char*)MALLOC(sizeof(char)*BUFFER_LEN);
170 if (str_info)
171 {
172 sprintf(str_info,"PCRE Version: %d.%d", PCRE_MAJOR,PCRE_MINOR);
173 outputDynamicList = appendStringStaticDebugInfo(outputDynamicList,&nb_info,str_info);
174 }
175
176 *sizeArray = nb_info;
177 return outputDynamicList;
149} 178}
150/*--------------------------------------------------------------------------*/ 179/*--------------------------------------------------------------------------*/
151static char ** appendStringStaticDebugInfo(char **listInfo,int *sizeListInfo,char *str) 180static char ** appendStringStaticDebugInfo(char **listInfo,int *sizeListInfo,char *str)
152{ 181{
153 char ** returnListInfo = NULL; 182 char ** returnListInfo = NULL;
154 if (listInfo) 183 if (listInfo)
155 { 184 {
156 (*sizeListInfo)++; 185 (*sizeListInfo)++;
157 returnListInfo = (char**)REALLOC(listInfo,sizeof(char*)*(*sizeListInfo)); 186 returnListInfo = (char**)REALLOC(listInfo,sizeof(char*)*(*sizeListInfo));
158 } 187 }
159 else 188 else
160 { 189 {
161 (*sizeListInfo) = 1; 190 (*sizeListInfo) = 1;
162 returnListInfo = (char**)MALLOC(sizeof(char*)*(*sizeListInfo)); 191 returnListInfo = (char**)MALLOC(sizeof(char*)*(*sizeListInfo));
163 } 192 }
164 193
165 if (returnListInfo) 194 if (returnListInfo)
166 { 195 {
167 returnListInfo[(*sizeListInfo) - 1] = str; 196 returnListInfo[(*sizeListInfo) - 1] = str;
168 } 197 }
169 return returnListInfo; 198 return returnListInfo;
170} 199}
171/*--------------------------------------------------------------------------*/ 200/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/core/src/c/getversion.c b/scilab/modules/core/src/c/getversion.c
index e85c24c..44944bd 100644
--- a/scilab/modules/core/src/c/getversion.c
+++ b/scilab/modules/core/src/c/getversion.c
@@ -27,7 +27,6 @@
27#define PVM_MODULE_NAME "pvm" 27#define PVM_MODULE_NAME "pvm"
28#define PVM_OPTION_STRING "pvm" 28#define PVM_OPTION_STRING "pvm"
29#define TCLTK_OPTION_STRING "tk" 29#define TCLTK_OPTION_STRING "tk"
30#define ATLAS_OPTION_STRING "atlas"
31#define MODELICAC_OPTION_STRING "modelicac" 30#define MODELICAC_OPTION_STRING "modelicac"
32#define X86_STRING "x86" 31#define X86_STRING "x86"
33#define X64_STRING "x64" 32#define X64_STRING "x64"
@@ -196,20 +195,6 @@ char **getScilabVersionOptions(int *sizeArrayReturned)
196 } 195 }
197 } 196 }
198 197
199 if (with_atlas())
200 {
201 options = REALLOC(options, sizeof(char*) * (nbOptions + 1));
202 if (options)
203 {
204 options[nbOptions] = strdup(ATLAS_OPTION_STRING);
205 nbOptions++;
206 }
207 else
208 {
209 return NULL;
210 }
211 }
212
213 options = REALLOC(options, sizeof(char*) * (nbOptions + 1)); 198 options = REALLOC(options, sizeof(char*) * (nbOptions + 1));
214 if (options) 199 if (options)
215 { 200 {
@@ -331,12 +316,3 @@ BOOL with_tk(void)
331 return with_module(TCLSCI_MODULE_NAME) && (getScilabMode() != SCILAB_NWNI); 316 return with_module(TCLSCI_MODULE_NAME) && (getScilabMode() != SCILAB_NWNI);
332} 317}
333/*--------------------------------------------------------------------------*/ 318/*--------------------------------------------------------------------------*/
334BOOL with_atlas(void)
335{
336 #ifdef WITH_ATLAS
337 return TRUE;
338 #else
339 return FALSE;
340 #endif
341}
342/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/helptools/data/configuration/scilab_macros.txt b/scilab/modules/helptools/data/configuration/scilab_macros.txt
index eea54f1..154ed10 100644
--- a/scilab/modules/helptools/data/configuration/scilab_macros.txt
+++ b/scilab/modules/helptools/data/configuration/scilab_macros.txt
@@ -1981,7 +1981,6 @@ check_modules_xml
1981ver 1981ver
1982add_demo 1982add_demo
1983edit 1983edit
1984with_atlas
1985whereami 1984whereami
1986with_texmacs 1985with_texmacs
1987with_tk 1986with_tk
diff --git a/scilab/modules/windows_tools/src/c/scilab_windows/getBlasType.c b/scilab/modules/windows_tools/src/c/scilab_windows/getBlasType.c
new file mode 100644
index 0000000..b68acf1
--- /dev/null
+++ b/scilab/modules/windows_tools/src/c/scilab_windows/getBlasType.c
@@ -0,0 +1,65 @@
1/*
2* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3* Copyright (C) DIGITEO - 2011 - Allan CORNET
4*
5* This file must be used under the terms of the CeCILL.
6* This source file is licensed as described in the file COPYING, which
7* you should have received as part of this distribution. The terms
8* are also available at
9* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10*
11*/
12/*--------------------------------------------------------------------------*/
13#include <Windows.h>
14#include "getBlasType.h"
15/*--------------------------------------------------------------------------*/
16#define BLASLIBNAME "blasplus.dll"
17#define DGEMMCNAME "dgemm"
18#define DGEMMFNAME "dgemm_"
19#define MKLGETVERSIONNAME "MKL_Get_Version"
20/*--------------------------------------------------------------------------*/
21static blas_type blasType = BLAS_UNKNOW;
22static BOOL bBlasDetected = FALSE;
23/*--------------------------------------------------------------------------*/
24typedef int (*DGEMPROC_C) ();
25typedef int (*DGEMPROC_F) ();
26typedef int (*MKL_GET_VERSIONPROC) ();
27/*--------------------------------------------------------------------------*/
28blas_type getBlasType(void)
29{
30 if (!bBlasDetected)
31 {
32 HINSTANCE BlasDll = NULL;
33 bBlasDetected = TRUE;
34 BlasDll = LoadLibrary (BLASLIBNAME);
35 if (BlasDll != NULL)
36 {
37 DGEMPROC_C dynDGEMMPROC_C = (DGEMPROC_C)GetProcAddress(BlasDll, DGEMMCNAME);
38 DGEMPROC_F dynDGEMMPROC_F = (DGEMPROC_C)GetProcAddress(BlasDll, "dgemm_");
39 MKL_GET_VERSIONPROC dynMKL_GET_VERSIONPROC = (MKL_GET_VERSIONPROC)GetProcAddress(BlasDll, MKLGETVERSIONNAME);
40 if (dynMKL_GET_VERSIONPROC)
41 {
42 blasType = BLAS_MKL;
43 }
44 else
45 {
46 if (dynDGEMMPROC_C && dynDGEMMPROC_F)
47 {
48 blasType = BLAS_REF;
49 }
50 else
51 {
52 if ((dynDGEMMPROC_F == NULL) && (dynDGEMMPROC_C))
53 {
54 blasType = BLAS_ATLAS;
55 }
56 }
57 }
58 FreeLibrary(BlasDll);
59 BlasDll = NULL;
60 }
61 }
62 return blasType;
63}
64/*--------------------------------------------------------------------------*/
65
diff --git a/scilab/modules/windows_tools/src/c/scilab_windows/getBlasType.h b/scilab/modules/windows_tools/src/c/scilab_windows/getBlasType.h
new file mode 100644
index 0000000..88ab782
--- /dev/null
+++ b/scilab/modules/windows_tools/src/c/scilab_windows/getBlasType.h
@@ -0,0 +1,28 @@
1/*
2* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3* Copyright (C) DIGITEO - 2011 - Allan CORNET
4*
5* This file must be used under the terms of the CeCILL.
6* This source file is licensed as described in the file COPYING, which
7* you should have received as part of this distribution. The terms
8* are also available at
9* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10*
11*/
12/*--------------------------------------------------------------------------*/
13#ifndef __GETBLASTYPE_H__
14#define __GETBLASTYPE_H__
15
16#include "dynlib_scilab_windows.h"
17
18typedef enum { BLAS_UNKNOW = -1,
19 BLAS_REF = 0,
20 BLAS_ATLAS = 1,
21 BLAS_MKL = 2
22} blas_type;
23
24/* detect blas type used by scilab */
25SCILAB_WINDOWS_IMPEXP blas_type getBlasType(void);
26
27#endif /* __GETBLASTYPE_H__ */
28/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj b/scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj
index be59705..a83bb94 100644
--- a/scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj
+++ b/scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj
@@ -404,6 +404,10 @@
404 > 404 >
405 </File> 405 </File>
406 <File 406 <File
407 RelativePath=".\getBlasType.c"
408 >
409 </File>
410 <File
407 RelativePath=".\getScilabDirectory.c" 411 RelativePath=".\getScilabDirectory.c"
408 > 412 >
409 </File> 413 </File>
@@ -513,6 +517,10 @@
513 > 517 >
514 </File> 518 </File>
515 <File 519 <File
520 RelativePath=".\getBlasType.h"
521 >
522 </File>
523 <File
516 RelativePath=".\getScilabDirectory.h" 524 RelativePath=".\getScilabDirectory.h"
517 > 525 >
518 </File> 526 </File>