Skip to content

Commit e34cbb4

Browse files
authored
Align cuOpt documentation branding and Doxygen configuration (#1503)
- adds a GitHub icon to the NVIDIA Sphinx theme header - removes the unused custom square NVIDIA logo - uses `NVIDIA cuOpt Documentation` consistently for LaTeX, man, and Texinfo output - removes obsolete or unavailable Doxygen 1.9.1 options and host-specific inputs - corrects the documented termination-status parameter name - removes redundant Breathe auto-Doxygen configuration ## Issue Follow-up to rapidsai/build-planning#300. ## Validation - Doxygen 1.9.1 generation completes without warnings - strict Sphinx HTML build passes with `-n -W --keep-going` - Sphinx link check passes - targeted pre-commit hooks pass Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Ramakrishna Prabhu (https://github.com/ramakrishnap-nv) - Alice Boucher (https://github.com/aliceb-nv) URL: #1503
1 parent 486c55f commit e34cbb4

4 files changed

Lines changed: 14 additions & 19 deletions

File tree

cpp/doxygen/Doxyfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ ALIASES =
234234
# A mapping has the form "name=value". For example adding "class=itcl::class"
235235
# will allow you to use the command class in the itcl::class meaning.
236236

237-
TCL_SUBST =
238237

239238
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
240239
# only. Doxygen will then generate output that is more tailored for C. For
@@ -773,8 +772,7 @@ WARN_LOGFILE =
773772

774773
INPUT = main_page.md \
775774
../include/cuopt/mathematical_optimization/cuopt_c.h \
776-
../include/cuopt/mathematical_optimization/constants.h \
777-
/usr/include/stdint.h
775+
../include/cuopt/mathematical_optimization/constants.h
778776

779777
# This tag can be used to specify the character encoding of the source files
780778
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1020,15 +1018,13 @@ VERBATIM_HEADERS = YES
10201018
# generated with the -Duse-libclang=ON option for CMake.
10211019
# The default value is: NO.
10221020

1023-
CLANG_ASSISTED_PARSING = NO
10241021

10251022
# If clang assisted parsing is enabled you can provide the compiler with command
10261023
# line options that you would normally use when invoking the compiler. Note that
10271024
# the include paths will already be set by doxygen for the files and directories
10281025
# specified with INPUT and INCLUDE_PATH.
10291026
# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
10301027

1031-
CLANG_OPTIONS =
10321028

10331029
#---------------------------------------------------------------------------
10341030
# Configuration options related to the alphabetical class index
@@ -1046,7 +1042,6 @@ ALPHABETICAL_INDEX = YES
10461042
# Minimum value: 1, maximum value: 20, default value: 5.
10471043
# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
10481044

1049-
COLS_IN_ALPHA_INDEX = 5
10501045

10511046
# In case all classes in a project start with a common prefix, all classes will
10521047
# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
@@ -2117,7 +2112,6 @@ EXTERNAL_PAGES = YES
21172112
# interpreter (i.e. the result of 'which perl').
21182113
# The default file (with absolute path) is: /usr/bin/perl.
21192114

2120-
PERL_PATH = /usr/bin/perl
21212115

21222116
#---------------------------------------------------------------------------
21232117
# Configuration options related to the dot tool
@@ -2139,7 +2133,6 @@ CLASS_DIAGRAMS = YES
21392133
# the mscgen tool resides. If left empty the tool is assumed to be found in the
21402134
# default search path.
21412135

2142-
MSCGEN_PATH =
21432136

21442137
# You can include diagrams made with dia in doxygen documentation. Doxygen will
21452138
# then run dia to produce the diagram and insert it in the documentation. The

cpp/include/cuopt/mathematical_optimization/cuopt_c.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,8 +934,8 @@ void cuOptDestroySolution(cuOptSolution* solution_ptr);
934934
*
935935
* @param[in] solution - The solution object.
936936
*
937-
* @param[out] termination_reason_ptr - A pointer to a cuopt_int_t that on output will contain the
938-
* termination reason.
937+
* @param[out] termination_status_ptr - A pointer to a cuopt_int_t that on output will contain the
938+
* termination status.
939939
*
940940
* @return A status code indicating success or failure.
941941
*/

docs/cuopt/source/conf.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,19 @@
135135
# a list of builtin themes.
136136
#
137137
html_theme = "nvidia_sphinx_theme"
138-
html_logo = "images/main_nv_logo_square.png"
139138
html_title = f"{project} ({version})"
140139

141140
autosectionlabel_prefix_document = True
142141

143142
html_theme_options = {
143+
"icon_links": [
144+
{
145+
"name": "GitHub",
146+
"url": "https://github.com/NVIDIA/cuopt",
147+
"icon": "fa-brands fa-github",
148+
"type": "fontawesome",
149+
},
150+
],
144151
"collapse_navigation": False,
145152
"navigation_depth": 6,
146153
"switcher": {
@@ -178,11 +185,6 @@
178185
breathe_domain_by_extension = {"hpp": "cpp", "h": "c", "c": "c"}
179186
breathe_implementation_filename_extensions = [".cpp", ".cu"]
180187

181-
# Configure Breathe to handle source files
182-
breathe_projects_source = {
183-
"libcuopt": ("../../../cpp/src", ["*.hpp", "*.h", "*.cuh", "*.cu"])
184-
}
185-
186188
# Configure Breathe to handle CUDA and template attributes
187189
breathe_doxygen_aliases = {
188190
"int32_t": "int32_t",
@@ -212,7 +214,7 @@
212214
(
213215
master_doc,
214216
"cuopt.tex",
215-
"cuopt Documentation",
217+
f"{project} Documentation",
216218
"NVIDIA Corporation",
217219
"manual",
218220
)
@@ -222,7 +224,7 @@
222224

223225
# One entry per manual page. List of tuples
224226
# (source start file, name, description, authors, manual section).
225-
man_pages = [(master_doc, "cuopt", "cuopt Documentation", [author], 1)]
227+
man_pages = [(master_doc, "cuopt", f"{project} Documentation", [author], 1)]
226228

227229

228230
# -- Options for Texinfo output -------------------------------------------
@@ -234,7 +236,7 @@
234236
(
235237
master_doc,
236238
"cuopt",
237-
"cuopt Documentation",
239+
f"{project} Documentation",
238240
author,
239241
"cuopt",
240242
"One line description of project.",
-21.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)