WIP: use pympistandard by editing PYTHONPATH (instead of using venv)

Author: Joe-Downs

ompi/mpi/bindings/c_header.py

@@ -10,10 +10,10 @@
 import argparse
 import re
 import json
+import sys
+import os
 from pathlib import Path
 
-import pympistandard as std
-
 # ============================= Constants / Globals ============================
 DIR = Path(".")
 OUTPUT = DIR / "mpi.h"
@@ -80,6 +80,7 @@
 parser.add_argument("-o", "--output", type=str, help="output path for the header file")
 parser.add_argument("--mangle-names", help="enable name mangling for constants and datatypes", action="store_true")
 parser.add_argument("--no-mangle", help="disable name mangling (default)", action="store_true")
+parser.add_argument("--pympistd-dir", type=str, help="directory for the pympistandard library")
 
 args = parser.parse_args()
 
@@ -93,6 +94,15 @@
     OUTPUT = Path(args.output)
 if args.input:
     INPUT = Path(args.input)
+if args.pympistd_dir:
+    PYMPISTANDARD_DIR = Path(args.pympistd_dir)
+
+# A bit of a hack to load the pympistandard module, which is in
+# the Open MPI '3rd-party" tree in the source dir.
+pympi_dir = PYMPISTANDARD_DIR / "src"
+sys.path.insert(0, str(pympi_dir.resolve()))
+
+import pympistandard as std
 
 # ================================== Load JSON =================================
 with open(JSON_PATH) as f:

ompi/mpi/c/Makefile.am

@@ -565,6 +565,7 @@ standard_abi/mpi.h: $(top_srcdir)/docs/mpi-standard-apis.json $(top_srcdir)/ompi
 	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/c_header.py \
 	--input $(top_srcdir)/ompi/mpi/c/abi.h.in \
 	--abi-json $(top_srcdir)/docs/mpi-standard-abi.json \
+	--pympistd $(top_srcdir)/3rd-party/pympistandard/src \
 	--output $(top_srcdir)/ompi/mpi/c/standard_abi/mpi.h
 
 # Mangled version
@@ -573,6 +574,7 @@ abi.h: $(top_srcdir)/docs/mpi-standard-apis.json $(top_srcdir)/ompi/mpi/bindings
 	--input $(top_srcdir)/ompi/mpi/c/abi.h.in \
 	--output $(top_srcdir)/ompi/mpi/c/abi.h \
 	--abi-json $(top_srcdir)/docs/mpi-standard-abi.json \
+	--pympistd-dir $(top_srcdir)/3rd-party/pympistandard \
 	--mangle-names
 
 %_abi_generated.c: %.c.in
@@ -586,7 +588,7 @@ abi.h: $(top_srcdir)/docs/mpi-standard-apis.json $(top_srcdir)/ompi/mpi/bindings
 	    $<
 endif
 
-MAINTAINERCLEANFILES = *_generated.c abi.h
+MAINTAINERCLEANFILES = *_generated.c $(nobase_include_HEADERS)
 if OMPI_STANDARD_ABI
 include Makefile_abi.include
 endif