Compiler optimizations

CMakeLists.txt

@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(Boost_NO_BOOST_CMAKE ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+    "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -ffast-math -O3")
 
 find_package(Graphviz)
 

build_and_run.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# build_and_run.sh
+
+rm -rf build
+rm -rf delphi/cpp/*
+
+mkdir -p build
+cd build
+cmake ..
+cmake --build . -- -j12 DelphiPython
+cp *.so ../delphi/cpp
+cd ..
+
+time python test.py

lib/utils.cpp

@@ -12,7 +12,7 @@ namespace delphi::utils {
 /**
  * Returns the square of a number.
  */
-double sqr(double x) { return x * x; }
+// double sqr(double x) { return x * x; }
 
 /**
  * Returns the sum of a vector of doubles.

lib/utils.hpp

@@ -47,7 +47,7 @@ template <class F, class V> vector<V> lmap(F f, vector<V> vec) {
 /**
  * Returns the square of a number.
  */
-double sqr(double x);
+inline double sqr(double x) {return x * x};
 
 /**
  * Returns the sum of a vector of doubles.

test.py

@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+"""
+    test.py
+
+    Derived from: https://github.com/ml4ai/delphi/blob/c07eeae9394ab30ca8d984b2ec2e40ab4c2d2e08/scripts/debugger.py
+"""
+
+import os
+os.environ['DELPHI_DB'] = './data/delphi.db'
+
+import delphi.plotter as dp
+from delphi.cpp.DelphiPython import AnalysisGraph, InitialBeta, InitialDerivative
+import pandas as pd
+import numpy as np
+
+
+def set_indicator(G, concept, indicator_new, source):
+    G.delete_all_indicators(concept)
+    G.set_indicator(concept, indicator_new, source)
+
+def remove_node(G, concept, indicator_new, source):
+    G.delete_all_indicators(concept)
+    G.remove_node(concept)
+
+
+def curate_indicators(G):
+    '''
+    set_indicator(
+        G,
+        "wm/concept/indicator_and_reported_property/weather/rainfall",
+        "Average Precipitation",
+        "DSSAT",
+    )
+    '''
+
+    set_indicator(
+        G,
+        "wm/concept/indicator_and_reported_property/agriculture/Crop_Production",
+        "Average Harvested Weight at Maturity (Maize)",
+        "DSSAT",
+    )
+
+    set_indicator(
+        G,
+        "wm/concept/causal_factor/condition/food_insecurity",
+        "IPC Phase Classification",
+        "FEWSNET",
+    )
+
+    '''
+    set_indicator(
+        G,
+        "wm/concept/causal_factor/economic_and_commerce/economic_activity/market/price_or_cost/food_price",
+        "Consumer price index",
+        "WDI",
+    )
+
+    set_indicator(
+        G,
+        "wm/concept/indicator_and_reported_property/conflict/population_displacement",
+        "Internally displaced persons, total displaced by conflict and violence",
+        "WDI",
+    )
+
+    set_indicator(
+        G,
+        "wm/concept/causal_factor/condition/tension",
+        "Conflict incidences",
+        "None",
+    )
+    #G.remove_node("wm/concept/indicator_and_reported_property/agriculture/Crop_Production")
+    G.remove_node("wm/concept/indicator_and_reported_property/weather/rainfall")
+    G.remove_node("wm/concept/indicator_and_reported_property/conflict/population_displacement")
+    G.remove_node("wm/concept/causal_factor/condition/tension")
+    '''
+
+def create_base_CAG(causemos_create_model,
+                    belief_score_cutoff=0,
+                    grounding_score_cutoff=0,
+                    kde_kernels=4):
+    if causemos_create_model:
+        G = AnalysisGraph.from_causemos_json_file(causemos_create_model,
+                                                  belief_score_cutoff,
+                                                  grounding_score_cutoff,
+                                                  kde_kernels)
+    else:
+        statements = [
+            (
+                ("large", 1, "wm/concept/indicator_and_reported_property/agriculture/Crop_Production"),
+                ("small", -1, "wm/concept/causal_factor/condition/food_insecurity"),
+            )
+        ]
+        G = AnalysisGraph.from_causal_fragments(statements)
+        G.map_concepts_to_indicators()
+        curate_indicators(G)
+    return G
+
+
+def draw_CAG(G, file_name):
+    G.to_png(
+        file_name,
+        rankdir="TB",
+        simplified_labels=False,
+    )
+
+
+
+json_inputs = [
+    ["./tests/data/delphi/create_model_test.json",                 # 0. Missing data and mixed sampling frequency
+        "./tests/data/delphi/experiments_projection_test.json"],
+    ["./tests/data/delphi/create_model_ideal.json",                # 1. Ideal data with gaps of 1
+        "./tests/data/delphi/experiments_projection_ideal.json"],
+    ["./tests/data/delphi/create_model_input_2.json",              # 2. Usual Data
+        "./tests/data/delphi/experiments_projection_input_2.json"],
+    ["./tests/data/delphi/create_model_ideal_10.json",             # 3. Ideal data with gaps of 10
+        "./tests/data/delphi/experiments_projection_ideal_2.json"],
+    ["./tests/data/delphi/create_model_ideal_3.json",              # 4. Ideal data with real epochs
+        "./tests/data/delphi/experiments_projection_ideal_3.json"],
+    ["./tests/data/delphi/create_model_input_2_no_data.json",      # 5. No data
+        "./tests/data/delphi/experiments_projection_input_2.json"],
+    ["./tests/data/delphi/create_model_input_2_partial_data.json", # 6. Partial data
+        "./tests/data/delphi/experiments_projection_input_2.json"],
+    ["./tests/data/delphi/create_model_input_new.json",            # 7. Updated create model format
+        ""],
+    ["./tests/data/delphi/causemos_create.json",                   # 8. Oldest test data
+        "./tests/data/delphi/causemos_experiments_projection_input.json"],
+    ["./tests/data/delphi/create_model_rain--temperature--yield.json",    # 9. rain-temperature CAG
+        "./tests/data/delphi/experiments_rain--temperature--yield.json"],
+    ["./tests/data/delphi/create_model_rain--temperature.json",    # 10. rain-temperature CAG
+        "./tests/data/delphi/experiments_rain--temperature--yield.json"],
+]
+
+input_idx = 9
+causemos_create_model      = json_inputs[input_idx][0]
+causemos_create_experiment = json_inputs[input_idx][1]
+
+G = AnalysisGraph.from_causemos_json_file(
+  causemos_create_model,
+  belief_score_cutoff=0,
+  grounding_score_cutoff=0,
+  kde_kernels=10
+)
+
+G.set_random_seed(81)
+
+G.run_train_model(
+    res                = 200,
+    burn               = 1000,
+    initial_beta       = InitialBeta.ZERO,
+    initial_derivative = InitialDerivative.DERI_ZERO,
+    use_continuous     = True
+)