Skip to content

Commit d045a89

Browse files
committed
[dev] minor refactorings, and add project description
1 parent 4db9661 commit d045a89

File tree

8 files changed

+29
-30
lines changed

8 files changed

+29
-30
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# monilogger
1+
# Monilogger
22

33
A Python logging and monitoring toolbox for C++ and Python-embedding applications.
44

build-and-test.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
3+
rm dist/*
4+
python3 -m build
5+
pip install dist/monilogger-0.0.3.tar.gz
6+
python3 -m unittest

setup.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from setuptools import Extension, find_packages, setup
1010
from distutils import ccompiler
1111

12-
__version__ = "0.0.2"
12+
__version__ = "0.0.3"
1313

1414
# Convert distutils Windows platform specifiers to CMake -A arguments
1515
PLAT_TO_CMAKE = {
@@ -124,14 +124,19 @@ def build_extension(self, ext):
124124
# ),
125125
# ]
126126

127+
from pathlib import Path
128+
this_directory = Path(__file__).parent
129+
long_description = (this_directory / "README.md").read_text()
130+
127131
setup(
128132
name="monilogger",
129133
version=__version__,
130134
author="Dorian Leroy",
131135
author_email="[email protected]",
132136
url="https://github.com/cea-hpc/monilogger",
133137
description="A Python logging and monitoring toolbox for C++ applications.",
134-
long_description="",
138+
long_description=long_description,
139+
long_description_content_type='text/markdown',
135140
packages=["monilogger"],
136141
package_dir={"": "src/api"},
137142
package_data={

src/api/MoniLogger.cc

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ namespace MoniLogger
245245
}
246246
}
247247

248-
void bootstrap_monilogger(std::vector<std::string> python_path,
248+
void initialize_monilogger(std::vector<std::string> python_path,
249249
std::vector<std::string> python_scripts,
250250
std::string interface_module,
251251
std::function<void (py::module_, py::object)> interface_module_initializer)
@@ -275,20 +275,3 @@ namespace MoniLogger
275275
}
276276
}
277277
}
278-
279-
PYBIND11_MODULE(_monilogger, m) {
280-
m.attr("__name__") = "monilogger._monilogger";
281-
py::class_<MoniLogger::MoniLoggerExecutionContext, std::shared_ptr<MoniLogger::MoniLoggerExecutionContext>>(m, "MoniLoggerExecutionContext")
282-
.def(py::init<>());
283-
m.def("register", &MoniLogger::register_monilogger);
284-
m.def("stop", &MoniLogger::unregister_monilogger);
285-
m.def("define_event", &MoniLogger::register_composite_event);
286-
m.def("define_basic_events", &MoniLogger::register_base_events);
287-
m.def("get_basic-events", &MoniLogger::get_base_events);
288-
m.def("emit_event", [](std::string event_name, std::shared_ptr<MoniLogger::MoniLoggerExecutionContext> scope)
289-
{
290-
MoniLogger::trigger(event_name, scope);
291-
});
292-
}
293-
294-

src/api/monilogger/include/MoniLogger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace MoniLogger
5050
void trigger(size_t event_id, std::shared_ptr<MoniLoggerExecutionContext> scope);
5151

5252
__attribute__((visibility("default")))
53-
void bootstrap_monilogger(std::vector<std::string> python_path,
53+
void initialize_monilogger(std::vector<std::string> python_path,
5454
std::vector<std::string> python_scripts,
5555
std::string interface_module,
5656
std::function<void (py::module_, py::object)> interface_module_initializer);

src/api/monilogger_module.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PYBIND11_MODULE(_monilogger, m) {
88
m.def("stop", &MoniLogger::unregister_monilogger);
99
m.def("define_event", &MoniLogger::register_composite_event);
1010
m.def("define_basic_events", &MoniLogger::register_base_events);
11-
m.def("get_basic-events", &MoniLogger::get_base_events);
11+
m.def("get_basic_events", &MoniLogger::get_base_events);
1212
m.def("emit_event", [](std::string event_name, std::shared_ptr<MoniLogger::MoniLoggerExecutionContext> scope)
1313
{
1414
MoniLogger::trigger(event_name, scope);

src/bindings/cpp/README.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# **Using monilogger in your C++ app**
1+
# Using monilogger in your C++ app
22

3-
## **Defining the execution events**
3+
## Defining the execution events
44

55
```cpp
66
MoniLogger::register_base_events({
@@ -13,7 +13,7 @@ MoniLogger::register_base_events({
1313
MoniLogger::register_composite_event("SomeCompositeEvent", {"SomeEvent", "SomeOtherEvent"});
1414
```
1515

16-
## **Defining the exposed execution context**
16+
## Defining the exposed execution context
1717

1818
```cpp
1919
struct MyExecutionContext : MoniLogger::MoniLoggerExecutionContext
@@ -27,7 +27,7 @@ struct MyExecutionContext : MoniLogger::MoniLoggerExecutionContext
2727
};
2828
```
2929

30-
### **Exposing local variables**
30+
### Exposing local variables
3131

3232
```cpp
3333
struct MyExecutionContext : MoniLogger::MoniLoggerExecutionContext
@@ -41,7 +41,7 @@ struct MyExecutionContext : MoniLogger::MoniLoggerExecutionContext
4141
};
4242
```
4343

44-
### **Exposing class members**
44+
### Exposing class members
4545

4646
```cpp
4747
struct MyExecutionContext : MoniLogger::MoniLoggerExecutionContext
@@ -60,7 +60,7 @@ struct MyExecutionContext : MoniLogger::MoniLoggerExecutionContext
6060
};
6161
```
6262
63-
### **Exposing the context as a Python class**
63+
### Exposing the context as a Python class
6464
6565
```cpp
6666
// Initialization function for the interface module.
@@ -106,6 +106,11 @@ std::function<void (pybind11::module_, pybind11::object)> interface_module_initi
106106
// ...
107107
```
108108

109+
## Starting the Python interpreter and initializing monilogger
110+
111+
```cpp
112+
MoniLogger::initialize_monilogger(python_path, python_scripts, interface_module, interface_module_initializer);
113+
```
109114
110115
## Triggering execution events
111116

src/bindings/cpp/examples/simple-embedding/src/SimpleEmbedding.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ int main()
5959

6060
// Bootstrapping monilogger, consisting mainly of starting the Python interpreter, initializing
6161
// the monilogger module, and evaluating the provided scripts.
62-
MoniLogger::bootstrap_monilogger(python_path, python_scripts, interface_module, interface_module_initializer);
62+
MoniLogger::initialize_monilogger(python_path, python_scripts, interface_module, interface_module_initializer);
6363

6464
double foo(0.0);
6565
ctx->foo = &foo;

0 commit comments

Comments
 (0)