LoadGen: Fix pybind include dirs.

mlcommons · Apr 11, 2019 · dcce465 · dcce465
1 parent fae96bf
commit dcce465
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/loadgen/BUILD.gn b/loadgen/BUILD.gn
@@ -60,7 +60,8 @@ loadable_module("mlperf_loadgen_pymodule_lib") {
   sources = [ "bindings/python_api.cc" ]
   deps = [ ":mlperf_loadgen", "../third_party:pybind11" ]
   configs += [ "//build/config/compiler:rtti",
-               "//build/config/compiler:exceptions" ]
+               "//build/config/compiler:exceptions",
+               "../third_party:pybind11_include", ]
   cflags = [ "-Wno-macro-redefined" ]
   include_dirs = [ "." ] + py_include_dirs
   ldflags = py_ld_flags

diff --git a/loadgen/bindings/python_api.cc b/loadgen/bindings/python_api.cc
@@ -3,10 +3,10 @@
 
 #include <functional>
 
-#include "third_party/pybind/include/pybind11/functional.h"
-#include "third_party/pybind/include/pybind11/pybind11.h"
-#include "third_party/pybind/include/pybind11/stl.h"
-#include "third_party/pybind/include/pybind11/stl_bind.h"
+#include "pybind11/functional.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
+#include "pybind11/stl_bind.h"
 
 #include "../loadgen.h"
 #include "../query_sample.h"

diff --git a/loadgen_pymodule_setup_lib.py b/loadgen_pymodule_setup_lib.py
@@ -12,7 +12,7 @@
                                      ('MINOR_VERSION', '5')],
                     library_dirs = ['obj/loadgen'],
                     libraries = ['mlperf_loadgen'],
-                    include_dirs = [ 'gen' ],
+                    include_dirs = [ 'gen', 'gen/third_party/pybind/include' ],
                     sources = [ 'gen/loadgen/bindings/python_api.cc' ])
 
 setup (name = 'mlperf_loadgen_lib',

diff --git a/loadgen_pymodule_setup_src.py b/loadgen_pymodule_setup_src.py
@@ -16,7 +16,7 @@
 mlperf_loadgen_module = Extension('mlperf_loadgen',
                     define_macros = [('MAJOR_VERSION', '0'),
                                      ('MINOR_VERSION', '5')],
-                    include_dirs = [ 'gen' ],
+                    include_dirs = [ 'gen', 'gen/third_party/pybind/include' ],
                     sources = [ "gen/loadgen/" + s for s in sources ])
 
 setup (name = 'mlperf_loadgen',

diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
@@ -29,6 +29,10 @@ source_set("pybind11") {
   sources = pybind11_sources
 }
 
+config("pybind11_include") {
+  include_dirs = [ "pybind/include" ]
+}
+
 copy("pybind_src") {
   sources = pybind11_sources
   outputs = [ get_path_info("//", "gen_dir") + "/{{source}}" ]