Changeset 16350 for branches/2915-AbsoluteSymbol/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter

Timestamp:

12/07/18 23:18:54 (5 years ago)

Author:

gkronber

Message:

#2915: merged r16333:16343 from trunk to branch (resolving a conflict in interpreter.h - the branch for sqrt)

Location:

branches/2915-AbsoluteSymbol

Files:

• . (modified) (1 prop)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/HeuristicLab.NativeInterpreter-0.1/DllImporter.cs (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/CMakeLists.txt (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.cpp (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.h (modified) (2 diffs)

branches/2915-AbsoluteSymbol/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/HeuristicLab.NativeInterpreter-0.1/DllImporter.cs

@@ -15 +15 @@
   }
 
-  public class NativeWrapper {
+  public static class NativeWrapper {
     private const string x86dll = "hl-native-interpreter-msvc-x86.dll";
     private const string x64dll = "hl-native-interpreter-msvc-x64.dll";

branches/2915-AbsoluteSymbol/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/CMakeLists.txt

@@ -17 +17 @@
 
 if(MSVC)
-    target_compile_options(hl-native-interpreter PRIVATE "/W4" "/Qvec-report:2" "$<$<CONFIG:Release>:/O2>")
-    target_compile_options(hl-native-interpreter-vdt PRIVATE "/W4" "/Qvec-report:2" "$<$<CONFIG:Release>:/O2>")
+    target_compile_options(hl-native-interpreter PRIVATE "/W4" "/Qvec-report:2" "/MT" "$<$<CONFIG:Release>:/O2>")
+    target_compile_options(hl-native-interpreter-vdt PRIVATE "/W4" "/Qvec-report:2" "/MT" "$<$<CONFIG:Release>:/O2>")
     target_compile_definitions(hl-native-interpreter-vdt PRIVATE "USE_VDT")
 else()

branches/2915-AbsoluteSymbol/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.cpp

@@ -50 +50 @@
     if (remainingRows > 0) 
     {
-        for (int rowIndex = total; rowIndex < totalRows; rowIndex += remainingRows)
-        {
-            evaluate(code, codeLength, rows, rowIndex, remainingRows);
-            std::memcpy(result + rowIndex, code[0].buf, remainingRows * sizeof(double));
-        }
+        evaluate(code, codeLength, rows, total, remainingRows);
+        std::memcpy(result + total, code[0].buf, remainingRows * sizeof(double));
     }
     _aligned_free(buffer);

branches/2915-AbsoluteSymbol/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.h

@@ -101 +101 @@
                     break;
                 }
+            case OpCodes::Square:
+                {
+                    in.value = std::pow(code[in.childIndex].value, 2.);
+                    break;
+                }
             case OpCodes::Sqrt:
                 {
@@ -257 +262 @@
             case OpCodes::Sqrt:
                 {
-                    pow(in.buf, code[in.childIndex].buf, 1./2.);
+                    sqrt(in.buf, code[in.childIndex].buf);
                     break;
                 }