diff --git a/configure.ac b/configure.ac index ffb31d266ef4..1d5f7d1a9a70 100644 --- a/configure.ac +++ b/configure.ac @@ -427,18 +427,6 @@ AS_IF([test "x$with_flux_security" = "xyes"], [ ]) AM_CONDITIONAL([HAVE_FLUX_SECURITY], [test "x$with_flux_security" = "xyes"]) -AC_ARG_ENABLE(caliper, - [ --enable-caliper[=OPTS] Use caliper for profiling. [default=no] [OPTS=no/yes]], , - [enable_caliper="no"]) - -if test "$enable_caliper" = "yes"; then - PKG_CHECK_MODULES([CALIPER], [caliper], [], []) - CFLAGS="${CFLAGS} ${CALIPER_CFLAGS} " - # Do not use CALIPER_LIBS, only link to libcaliper-stub - LIBS="${LIBS} $(pkg-config --libs-only-L caliper) -lcaliper-stub -lrt " - AC_DEFINE([HAVE_CALIPER], [1], [Define if you have libcaliper]) -fi - AC_ARG_ENABLE([content-s3], AS_HELP_STRING([--enable-content-s3], [Enable S3 storage backend])) diff --git a/doc/man1/flux-start.rst b/doc/man1/flux-start.rst index f85d9ed923a4..a7c4acda847b 100644 --- a/doc/man1/flux-start.rst +++ b/doc/man1/flux-start.rst @@ -146,13 +146,6 @@ OPTIONS Don't execute anything. This option is most useful with -v. -.. option:: --caliper-profile=PROFILE - - Run brokers with Caliper profiling enabled, using a Caliper - configuration profile named *PROFILE*. Requires a version of Flux - built with :option:`--enable-caliper`. Unless :envvar:`CALI_LOG_VERBOSITY` - is already set in the environment, it will default to 0 for all brokers. - .. option:: --rundir=DIR (only with :option:`--test-size`) Set the directory that will be diff --git a/scripts/fetch-and-build-caliper.sh b/scripts/fetch-and-build-caliper.sh deleted file mode 100755 index 161d1a3bf61e..000000000000 --- a/scripts/fetch-and-build-caliper.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -mkdir caliper -pushd caliper -wget -O - https://github.com/LLNL/Caliper/archive/v1.7.0.tar.gz | tar xvz --strip-components 1 -# patch for uint32_t error -sed -i '39i#include ' include/caliper/common/Record.h -cmake -B build -DCMAKE_INSTALL_PREFIX=/usr -DWITH_GOTCHA=Off -cmake --build build -j 4 -t install -popd -rm -rf caliper diff --git a/src/broker/broker.c b/src/broker/broker.c index 19872f336b3a..a401f38bde62 100644 --- a/src/broker/broker.c +++ b/src/broker/broker.c @@ -31,10 +31,6 @@ #endif #include #include -#if HAVE_CALIPER -#include -#include -#endif #if HAVE_VALGRIND # if HAVE_VALGRIND_H # include @@ -170,22 +166,6 @@ void parse_command_line_arguments (int argc, char *argv[], broker_ctx_t *ctx) } } -static int setup_profiling (const char *program, int rank) -{ -#if HAVE_CALIPER - cali_begin_string_byname ("flux.type", "main"); - cali_begin_int_byname ("flux.tid", syscall (SYS_gettid)); - cali_begin_string_byname ("binary", program); - cali_begin_int_byname ("flux.rank", rank); - // TODO: this is a stopgap until we have better control over - // instrumemtation in child processes. If we want to see what children - // that load libflux are up to, this should be disabled - unsetenv ("CALI_SERVICES_ENABLE"); - unsetenv ("CALI_CONFIG_PROFILE"); -#endif - return (0); -} - static int increase_rlimits (void) { struct rlimit rlim; @@ -406,9 +386,6 @@ int main (int argc, char *argv[]) flux_reactor_now (ctx.reactor) - ctx.starttime); } - // Setup profiling - setup_profiling (argv[0], ctx.rank); - /* Initialize logging. * OK to call flux_log*() after this. */ diff --git a/src/broker/module.c b/src/broker/module.c index 4bca2a8b8614..bda23d484d26 100644 --- a/src/broker/module.c +++ b/src/broker/module.c @@ -28,10 +28,6 @@ #endif #include #include -#if HAVE_CALIPER -#include -#include -#endif #include "src/common/libflux/plugin_private.h" #include "src/common/libutil/log.h" @@ -90,12 +86,6 @@ struct broker_module { static int setup_module_profiling (module_t *p) { -#if HAVE_CALIPER - cali_begin_string_byname ("flux.type", "module"); - cali_begin_int_byname ("flux.tid", syscall (SYS_gettid)); - cali_begin_int_byname ("flux.rank", p->rank); - cali_begin_string_byname ("flux.name", p->name); -#endif size_t len = strlen (p->name); // one character longer than target to pass -Wstringop-truncation char local_name[17] = {0}; diff --git a/src/cmd/builtin/version.c b/src/cmd/builtin/version.c index 5e67155377d2..248535f01fa5 100644 --- a/src/cmd/builtin/version.c +++ b/src/cmd/builtin/version.c @@ -61,9 +61,6 @@ static int cmd_version (optparse_t *p, int ac, char *av[]) #if __SANITIZE_THREAD__ printf ("+tsan"); #endif -#if HAVE_CALIPER - printf ("+caliper"); -#endif #if HAVE_LIBSYSTEMD printf ("+systemd"); #endif diff --git a/src/cmd/flux-start.c b/src/cmd/flux-start.c index 7fcc7d90dcd6..4634bcb1c713 100644 --- a/src/cmd/flux-start.c +++ b/src/cmd/flux-start.c @@ -92,7 +92,6 @@ int exec_broker (const char *cmd_argz, char *create_rundir (void); void client_destroy (struct client *cli); char *find_broker (const char *searchpath); -static void setup_profiling_env (void); static void client_wait_respond (struct client *cli); static void client_run_respond (struct client *cli, int errnum); @@ -119,14 +118,6 @@ static struct optparse_option opts[] = { .flags = OPTPARSE_OPT_AUTOSPLIT, .usage = "Add comma-separated broker options, e.g. \"-o,-v\"", }, /* Option group 1, these options will be listed after those above */ -#if HAVE_CALIPER - { .group = 1, - .name = "caliper-profile", .has_arg = 1, - .arginfo = "PROFILE", - .usage = "Enable profiling in brokers using Caliper configuration " - "profile named `PROFILE'", - }, -#endif /* !HAVE_CALIPER */ { .group = 1, .name = "wrap", .has_arg = 1, .arginfo = "ARGS,...", .flags = OPTPARSE_OPT_AUTOSPLIT, @@ -239,8 +230,6 @@ int main (int argc, char *argv[]) log_msg_exit ("--test-size argument must be > 0"); } - setup_profiling_env (); - if (!optparse_hasopt (ctx.opts, "test-size")) { int i; for (i = 0; i < ARRAY_SIZE (opts); i++) { @@ -270,36 +259,6 @@ int main (int argc, char *argv[]) return status; } -static void setup_profiling_env (void) -{ -#if HAVE_CALIPER - const char *profile; - /* - * If --profile was used, set or append libcaliper.so in LD_PRELOAD - * to subprocess environment, swapping stub symbols for the actual - * libcaliper symbols. - */ - if (optparse_getopt (ctx.opts, "caliper-profile", &profile) == 1) { - const char *pl = getenv ("LD_PRELOAD"); - int rc = setenvf ("LD_PRELOAD", - 1, - "%s%s%s", - pl ? pl : "", - pl ? " ": "", - "libcaliper.so"); - if (rc < 0) - log_err_exit ("Unable to set LD_PRELOAD in environment"); - - if ((profile != NULL) && - (setenv ("CALI_CONFIG_PROFILE", profile, 1) < 0)) - log_err_exit ("setenv (CALI_CONFIG_PROFILE)"); - setenv ("CALI_LOG_VERBOSITY", "0", 0); - } -#endif -} - - - char *find_broker (const char *searchpath) { char *cpy = xstrdup (searchpath); diff --git a/src/common/libflux/handle.c b/src/common/libflux/handle.c index a62824c5debe..2d1e4175efd0 100644 --- a/src/common/libflux/handle.c +++ b/src/common/libflux/handle.c @@ -20,10 +20,6 @@ #include #include #include -#if HAVE_CALIPER -#include -#include -#endif #include #include "src/common/libflux/plugin_private.h" @@ -42,23 +38,6 @@ #include "msg_deque.h" #include "message_private.h" // to check msg refcount in flux_send_new () -#if HAVE_CALIPER -struct profiling_context { - int initialized; - cali_id_t msg_type; - cali_id_t msg_seq; - cali_id_t msg_topic; - cali_id_t msg_sender; - cali_id_t msg_rpc; - cali_id_t msg_rpc_nodeid; - cali_id_t msg_rpc_resp_expected; - cali_id_t msg_action; - cali_id_t msg_match_type; - cali_id_t msg_match_tag; - cali_id_t msg_match_glob; -}; -#endif - struct flux_handle { flux_t *parent; // if FLUX_O_CLONE, my parent struct aux_item *aux; @@ -78,9 +57,6 @@ struct flux_handle { void *comms_error_arg; bool comms_error_in_progress; bool destroy_in_progress; -#if HAVE_CALIPER - struct profiling_context prof; -#endif struct rpc_track *tracker; }; @@ -121,107 +97,6 @@ static flux_t *lookup_clone_ancestor (flux_t *h) return h; } -#if HAVE_CALIPER -void profiling_context_init (struct profiling_context* prof) -{ - prof->msg_type = cali_create_attribute ("flux.message.type", - CALI_TYPE_STRING, - CALI_ATTR_DEFAULT | CALI_ATTR_ASVALUE); - prof->msg_seq = cali_create_attribute ("flux.message.seq", - CALI_TYPE_INT, - CALI_ATTR_SKIP_EVENTS); - prof->msg_topic = cali_create_attribute ("flux.message.topic", - CALI_TYPE_STRING, - CALI_ATTR_DEFAULT | CALI_ATTR_ASVALUE); - prof->msg_sender = cali_create_attribute ("flux.message.sender", - CALI_TYPE_STRING, - CALI_ATTR_SKIP_EVENTS); - // if flux.message.rpc is set, we're inside an RPC, it will be set to a - // type, single or multi - prof->msg_rpc = cali_create_attribute ("flux.message.rpc", - CALI_TYPE_STRING, - CALI_ATTR_SKIP_EVENTS); - prof->msg_rpc_nodeid = cali_create_attribute ("flux.message.rpc.nodeid", - CALI_TYPE_INT, - CALI_ATTR_SKIP_EVENTS); - prof->msg_rpc_resp_expected = - cali_create_attribute ("flux.message.response_expected", - CALI_TYPE_INT, - CALI_ATTR_SKIP_EVENTS); - prof->msg_action = cali_create_attribute ("flux.message.action", - CALI_TYPE_STRING, - CALI_ATTR_DEFAULT | CALI_ATTR_ASVALUE); - prof->msg_match_type = cali_create_attribute ("flux.message.match.type", - CALI_TYPE_INT, - CALI_ATTR_SKIP_EVENTS); - prof->msg_match_tag = cali_create_attribute ("flux.message.match.tag", - CALI_TYPE_INT, - CALI_ATTR_SKIP_EVENTS); - prof->msg_match_glob = cali_create_attribute ("flux.message.match.glob", - CALI_TYPE_STRING, - CALI_ATTR_SKIP_EVENTS); - prof->initialized=1; -} - -static void profiling_msg_snapshot (flux_t *h, - const flux_msg_t *msg, - int flags, - const char *msg_action) -{ - h = lookup_clone_ancestor (h); - cali_id_t attributes[3]; - const void * data[3]; - size_t size[3]; - - // This can get called before the handle is really ready - if(! h->prof.initialized) return; - - int len = 0; - - if (msg_action) { - attributes[len] = h->prof.msg_action; - data[len] = msg_action; - size[len] = strlen(msg_action); - ++len; - } - - int type; - flux_msg_get_type (msg, &type); - const char *msg_type = flux_msg_typestr (type); - if (msg_type) { - attributes[len] = h->prof.msg_type; - data[len] = msg_type; - size[len] = strlen(msg_type); - ++len; - } - - const char *msg_topic; - if (type != FLUX_MSGTYPE_CONTROL) - flux_msg_get_topic (msg, &msg_topic); - else - msg_topic = "NONE"; - /* attributes[len] = h->prof.msg_topic; */ - /* data[len] = msg_topic; */ - /* size[len] = strlen(msg_topic); */ - /* ++len; */ - - if (type == FLUX_MSGTYPE_EVENT) { - uint32_t seq; - flux_msg_get_seq (msg, &seq); - cali_begin_int (h->prof.msg_seq, seq); - } - cali_push_snapshot (CALI_SCOPE_PROCESS | CALI_SCOPE_THREAD, - len /* n_entries */, - attributes /* event_attributes */, - data /* event_data */, - size /* event_size */); - if (type == FLUX_MSGTYPE_EVENT) - cali_end (h->prof.msg_seq); -} - - -#endif - static connector_init_f *find_connector_builtin (const char *scheme) { for (int i = 0; i < ARRAY_SIZE (builtin_connectors); i++) @@ -352,9 +227,6 @@ flux_t *flux_open_ex (const char *uri, int flags, flux_error_t *errp) goto error; } h->dso = dso; -#if HAVE_CALIPER - profiling_context_init(&h->prof); -#endif if ((s = getenv ("FLUX_HANDLE_USERID"))) { uint32_t userid = strtoul (s, NULL, 10); if (flux_opt_set (h, @@ -877,9 +749,6 @@ int flux_send (flux_t *h, const flux_msg_t *msg, int flags) flags |= h->flags; update_tx_stats (h, msg); handle_trace_message (h, msg); -#if HAVE_CALIPER - profiling_msg_snapshot(h, msg, flags, "send"); -#endif while (h->ops->send (h->impl, msg, flags) < 0) { if (comms_error (h, errno) < 0) return -1; @@ -913,9 +782,6 @@ int flux_send_new (flux_t *h, flux_msg_t **msg, int flags) flags |= h->flags; update_tx_stats (h, *msg); handle_trace_message (h, *msg); -#if HAVE_CALIPER - profiling_msg_snapshot(h, *msg, flags, "send"); -#endif while (h->ops->send_new (h->impl, msg, flags) < 0) { if (comms_error (h, errno) < 0) return -1; @@ -1017,22 +883,6 @@ flux_msg_t *flux_recv (flux_t *h, struct flux_match match, int flags) if (defer_requeue (&l, h) < 0) goto error; defer_destroy (&l); -#if HAVE_CALIPER - cali_begin_int (h->prof.msg_match_type, match.typemask); - cali_begin_int (h->prof.msg_match_tag, match.matchtag); - cali_begin_string (h->prof.msg_match_glob, - match.topic_glob ? match.topic_glob : "NONE"); - const char *sender; - sender = flux_msg_route_first (msg); - if (sender) - cali_begin_string (h->prof.msg_sender, sender); - profiling_msg_snapshot (h, msg, flags, "recv"); - if (sender) - cali_end (h->prof.msg_sender); - cali_end (h->prof.msg_match_type); - cali_end (h->prof.msg_match_tag); - cali_end (h->prof.msg_match_glob); -#endif rpc_track_update (h->tracker, msg); return msg; error: diff --git a/src/common/libflux/msg_handler.c b/src/common/libflux/msg_handler.c index 6dc1ee31dbf5..5a94769a1ca6 100644 --- a/src/common/libflux/msg_handler.c +++ b/src/common/libflux/msg_handler.c @@ -12,10 +12,6 @@ #include "config.h" #endif #include -#if HAVE_CALIPER -#include -#include -#endif #include #include "src/common/libczmqcontainers/czmq_containers.h" @@ -38,11 +34,6 @@ struct dispatch { int running_count; int usecount; zlist_t *unmatched; -#if HAVE_CALIPER - cali_id_t prof_msg_type; - cali_id_t prof_msg_topic; - cali_id_t prof_msg_dispatch; -#endif }; #define HANDLER_MAGIC 0x44433322 @@ -260,17 +251,6 @@ static struct dispatch *dispatch_get (flux_t *h) if (!(d->handlers_method = method_hash_create ())) goto nomem; -#if HAVE_CALIPER - d->prof_msg_type = cali_create_attribute ("flux.message.type", - CALI_TYPE_STRING, - CALI_ATTR_SKIP_EVENTS); - d->prof_msg_topic = cali_create_attribute ("flux.message.topic", - CALI_TYPE_STRING, - CALI_ATTR_SKIP_EVENTS); - d->prof_msg_dispatch = cali_create_attribute ("flux.message.dispatch", - CALI_TYPE_BOOL, - CALI_ATTR_DEFAULT); -#endif if (flux_aux_set (h, "flux::dispatch", d, dispatch_destroy) < 0) goto error; } @@ -457,7 +437,7 @@ static void handle_cb (flux_reactor_t *r, goto done; } if (flux_msg_get_topic (msg, &topic) < 0) - topic = "unknown"; /* used for logging/caliper trace */ + topic = "unknown"; /* used for logging */ /* Add any new handlers here, making handler creation * safe to call during handlers list traversal below. @@ -465,24 +445,8 @@ static void handle_cb (flux_reactor_t *r, if (transfer_items_zlist (d->handlers_new, d->handlers) < 0) goto done; -#if defined(HAVE_CALIPER) - cali_begin_string (d->prof_msg_type, flux_msg_typestr (type)); - cali_begin_string (d->prof_msg_topic, topic); - cali_begin (d->prof_msg_dispatch); - cali_end (d->prof_msg_topic); - cali_end (d->prof_msg_type); -#endif - match = dispatch_message (d, msg, type); -#if defined(HAVE_CALIPER) - cali_begin_string (d->prof_msg_type, flux_msg_typestr (type)); - cali_begin_string (d->prof_msg_topic, topic); - cali_end (d->prof_msg_dispatch); - cali_end (d->prof_msg_topic); - cali_end (d->prof_msg_type); -#endif - /* Message was not "consumed". * If in a cloned handle, queue message for later. * Otherwise, respond with ENOSYS if it was a request, diff --git a/src/common/libflux/rpc.c b/src/common/libflux/rpc.c index c0585fc1c7fc..657ed524e22e 100644 --- a/src/common/libflux/rpc.c +++ b/src/common/libflux/rpc.c @@ -16,10 +16,6 @@ #include #include #include -#if HAVE_CALIPER -#include -#include -#endif #include #include @@ -183,12 +179,6 @@ static void response_cb (flux_t *h, int saved_errno; const char *errstr; -#if HAVE_CALIPER - cali_begin_string_byname ("flux.message.rpc", "single"); -#endif -#if HAVE_CALIPER - cali_end_byname ("flux.message.rpc"); -#endif if (flux_response_decode (msg, NULL, NULL) < 0) goto error; if (!(cpy = flux_msg_copy (msg, true))) @@ -270,18 +260,7 @@ static flux_future_t *flux_rpc_message_send_new (flux_t *h, } if (flux_msg_set_nodeid (*msg, nodeid) < 0) goto error; -#if HAVE_CALIPER - cali_begin_string_byname ("flux.message.rpc", "single"); - cali_begin_int_byname ("flux.message.rpc.nodeid", nodeid); - cali_begin_int_byname ("flux.message.response_expected", - !(flags & FLUX_RPC_NORESPONSE)); -#endif int rc = flux_send_new (h, msg, 0); -#if HAVE_CALIPER - cali_end_byname ("flux.message.response_expected"); - cali_end_byname ("flux.message.rpc.nodeid"); - cali_end_byname ("flux.message.rpc"); -#endif if (rc < 0) goto error; rpc->sent = true; diff --git a/src/test/docker/alpine/Dockerfile b/src/test/docker/alpine/Dockerfile index 032e78c3bb89..ed88fd8928d3 100644 --- a/src/test/docker/alpine/Dockerfile +++ b/src/test/docker/alpine/Dockerfile @@ -60,8 +60,3 @@ ENV LANG=C.UTF-8 # Install catch by hand for now: COPY scripts/fetch-and-build-catch.sh /fetch-and-build-catch.sh RUN /fetch-and-build-catch.sh - -# Install caliper by hand for now: -COPY scripts/fetch-and-build-caliper.sh /fetch-and-build-caliper.sh -RUN /fetch-and-build-caliper.sh - diff --git a/src/test/docker/bookworm/Dockerfile b/src/test/docker/bookworm/Dockerfile index 7b6c4ce09626..c9c00eb2d164 100644 --- a/src/test/docker/bookworm/Dockerfile +++ b/src/test/docker/bookworm/Dockerfile @@ -93,10 +93,6 @@ RUN locale-gen en_US.UTF-8 # NOTE: luaposix installed by rocks due to Ubuntu bug: #1752082 https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082 RUN luarocks install luaposix -# Install caliper by hand for now: -COPY scripts/fetch-and-build-caliper.sh /fetch-and-build-caliper.sh -RUN /fetch-and-build-caliper.sh - # Install catch by hand for now: COPY scripts/fetch-and-build-catch.sh /fetch-and-build-catch.sh RUN /fetch-and-build-catch.sh diff --git a/src/test/docker/docker-run-checks.sh b/src/test/docker/docker-run-checks.sh index 566ac9586100..13177f026b12 100755 --- a/src/test/docker/docker-run-checks.sh +++ b/src/test/docker/docker-run-checks.sh @@ -194,8 +194,7 @@ if [[ "$INSTALL_ONLY" == "t" ]]; then ./configure --prefix=/usr --sysconfdir=/etc \ --with-systemdsystemunitdir=/etc/systemd/system \ --localstatedir=/var \ - --with-flux-security \ - --enable-caliper && + --with-flux-security && make clean && make -j${JOBS}" RC=$? diff --git a/src/test/docker/el7/Dockerfile b/src/test/docker/el7/Dockerfile index e3ea90af02d3..eb386fdf3160 100644 --- a/src/test/docker/el7/Dockerfile +++ b/src/test/docker/el7/Dockerfile @@ -76,18 +76,6 @@ RUN wget -q --no-check-certificate https://cmake.org/files/v3.10/cmake-3.10.1-Li && rm -rf cmake-3.10.1-Linux-x86_64\ && rm cmake-3.10.1-Linux-x86_64.tar.gz -# Install caliper by hand for now: -RUN mkdir caliper \ - && cd caliper \ - && wget -O - https://github.com/LLNL/Caliper/archive/v1.7.0.tar.gz | tar xvz --strip-components 1 \ - && mkdir build \ - && cd build \ - && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - && make -j 4 \ - && make install \ - && cd ../.. \ - && rm -rf caliper - COPY config.site /usr/share/config.site ENV LANG=en_US.UTF-8 diff --git a/src/test/docker/el8/Dockerfile b/src/test/docker/el8/Dockerfile index ec62710b5c87..265fd8cdafae 100644 --- a/src/test/docker/el8/Dockerfile +++ b/src/test/docker/el8/Dockerfile @@ -79,10 +79,6 @@ RUN yum -y update \ # Set default /usr/bin/python to python3 RUN alternatives --set python /usr/bin/python3 -# Install caliper by hand for now: -COPY scripts/fetch-and-build-caliper.sh /fetch-and-build-caliper.sh -RUN /fetch-and-build-caliper.sh - # Install catch by hand for now: COPY scripts/fetch-and-build-catch.sh /fetch-and-build-catch.sh RUN /fetch-and-build-catch.sh diff --git a/src/test/docker/el9/Dockerfile b/src/test/docker/el9/Dockerfile index b55b80b0688f..dc39e521965c 100644 --- a/src/test/docker/el9/Dockerfile +++ b/src/test/docker/el9/Dockerfile @@ -79,10 +79,6 @@ RUN dnf -y install 'dnf-command(config-manager)' \ # Set default /usr/bin/python to python3 RUN ln -s /usr/bin/python3 /usr/bin/python -# Install caliper by hand for now: -COPY scripts/fetch-and-build-caliper.sh /fetch-and-build-caliper.sh -RUN /fetch-and-build-caliper.sh - # Install catch by hand for now: COPY scripts/fetch-and-build-catch.sh /fetch-and-build-catch.sh RUN /fetch-and-build-catch.sh diff --git a/src/test/docker/fedora33/Dockerfile b/src/test/docker/fedora33/Dockerfile index 9e5ad046b9f3..617479e563c1 100644 --- a/src/test/docker/fedora33/Dockerfile +++ b/src/test/docker/fedora33/Dockerfile @@ -72,18 +72,6 @@ RUN yum -y update \ # Add /usr/bin/mpicc link so MPI tests are built RUN alternatives --install /usr/bin/mpicc mpicc /usr/lib64/mpich/bin/mpicc 100 -# Install caliper by hand for now: -RUN mkdir caliper \ - && cd caliper \ - && wget -O - https://github.com/LLNL/Caliper/archive/v1.7.0.tar.gz | tar xvz --strip-components 1 \ - && mkdir build \ - && cd build \ - && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - && make -j 4 \ - && make install \ - && cd ../.. \ - && rm -rf caliper - ENV LANG=C.UTF-8 RUN printf "LANG=C.UTF-8" > /etc/locale.conf diff --git a/src/test/docker/fedora34/Dockerfile b/src/test/docker/fedora34/Dockerfile index 20eef726416a..2f6d4f24ebaa 100644 --- a/src/test/docker/fedora34/Dockerfile +++ b/src/test/docker/fedora34/Dockerfile @@ -72,18 +72,6 @@ RUN yum -y update \ # Add /usr/bin/mpicc link so MPI tests are built RUN alternatives --install /usr/bin/mpicc mpicc /usr/lib64/mpich/bin/mpicc 100 -# Install caliper by hand for now: -RUN mkdir caliper \ - && cd caliper \ - && wget -O - https://github.com/LLNL/Caliper/archive/v1.7.0.tar.gz | tar xvz --strip-components 1 \ - && mkdir build \ - && cd build \ - && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - && make -j 4 \ - && make install \ - && cd ../.. \ - && rm -rf caliper - ENV LANG=C.UTF-8 RUN printf "LANG=C.UTF-8" > /etc/locale.conf diff --git a/src/test/docker/fedora35/Dockerfile b/src/test/docker/fedora35/Dockerfile index 11777f0abda2..17303279fb9e 100644 --- a/src/test/docker/fedora35/Dockerfile +++ b/src/test/docker/fedora35/Dockerfile @@ -76,18 +76,6 @@ RUN yum -y update \ # Add /usr/bin/mpicc link so MPI tests are built RUN alternatives --install /usr/bin/mpicc mpicc /usr/lib64/mpich/bin/mpicc 100 -# Install caliper by hand for now: -RUN mkdir caliper \ - && cd caliper \ - && wget -O - https://github.com/LLNL/Caliper/archive/v1.7.0.tar.gz | tar xvz --strip-components 1 \ - && mkdir build \ - && cd build \ - && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DWITH_GOTCHA=off \ - && make -j 4 \ - && make install \ - && cd ../.. \ - && rm -rf caliper - # Install openpmix, prrte RUN mkdir prrte \ && cd prrte \ diff --git a/src/test/docker/fedora40/Dockerfile b/src/test/docker/fedora40/Dockerfile index 5fde179f0c17..067d07ff5e20 100644 --- a/src/test/docker/fedora40/Dockerfile +++ b/src/test/docker/fedora40/Dockerfile @@ -82,10 +82,6 @@ RUN printf "LANG=C.UTF-8" > /etc/locale.conf COPY src/test/docker/fedora40/config.site /usr/share/config.site -# Install caliper by hand for now: -COPY scripts/fetch-and-build-caliper.sh /fetch-and-build-caliper.sh -RUN /fetch-and-build-caliper.sh - # the psm3 connector added to libfabrics in ~1.12 causes errors when allowed to # use non-local connectors on a system with virtual NICs, since we're in a # docker container, prevent this diff --git a/src/test/docker/focal/Dockerfile b/src/test/docker/focal/Dockerfile index db2641de18c8..31b884999518 100644 --- a/src/test/docker/focal/Dockerfile +++ b/src/test/docker/focal/Dockerfile @@ -109,15 +109,3 @@ RUN apt-get update \ RUN locale-gen en_US.UTF-8 ENV LANG=C.UTF-8 - -# Install caliper by hand for now: -RUN mkdir caliper \ - && cd caliper \ - && wget -O - https://github.com/LLNL/Caliper/archive/v1.7.0.tar.gz | tar xvz --strip-components 1 \ - && mkdir build \ - && cd build \ - && CC=gcc CXX=g++ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DWITH_GOTCHA=Off \ - && make -j 4 \ - && make install \ - && cd ../.. \ - && rm -rf caliper diff --git a/src/test/docker/jammy/Dockerfile b/src/test/docker/jammy/Dockerfile index bbe9b3de5b57..ef703a30b99d 100644 --- a/src/test/docker/jammy/Dockerfile +++ b/src/test/docker/jammy/Dockerfile @@ -118,10 +118,6 @@ RUN locale-gen en_US.UTF-8 # NOTE: luaposix installed by rocks due to Ubuntu bug: #1752082 https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082 RUN luarocks install luaposix -# Install caliper by hand for now: -COPY scripts/fetch-and-build-caliper.sh /fetch-and-build-caliper.sh -RUN /fetch-and-build-caliper.sh - # Install catch by hand for now: COPY scripts/fetch-and-build-catch.sh /fetch-and-build-catch.sh RUN /fetch-and-build-catch.sh diff --git a/src/test/docker/noble/Dockerfile b/src/test/docker/noble/Dockerfile index c444a2c772df..dcf616fac866 100644 --- a/src/test/docker/noble/Dockerfile +++ b/src/test/docker/noble/Dockerfile @@ -102,10 +102,6 @@ RUN apt-get update \ # to /usr/bin/man to make this behave RUN ln -sf /usr/bin/man.REAL /usr/bin/man -# Install caliper by hand for now: -COPY scripts/fetch-and-build-caliper.sh /fetch-and-build-caliper.sh -RUN /fetch-and-build-caliper.sh - ENV LANG=C.UTF-8 # the image has a UID 1000 named ubuntu now for some reason, fix it diff --git a/src/test/generate-matrix.py b/src/test/generate-matrix.py index 2a8da8f8539f..8cd084219643 100755 --- a/src/test/generate-matrix.py +++ b/src/test/generate-matrix.py @@ -16,7 +16,6 @@ " --with-systemdsystemunitdir=/etc/systemd/system" " --localstatedir=/var" " --with-flux-security" - " --enable-caliper" ) DOCKER_REPO = "fluxrm/flux-core" @@ -197,7 +196,6 @@ def __str__(self): " --with-systemdsystemunitdir=/etc/systemd/system" " --localstatedir=/var" " --with-flux-security" - " --enable-caliper" ) matrix.add_multiarch_build( name="bookworm", @@ -251,7 +249,7 @@ def __str__(self): env=dict( TEST_INSTALL="t", ), - args="--with-flux-security --enable-caliper", + args="--with-flux-security", docker_tag=True, ) @@ -273,7 +271,7 @@ def __str__(self): CXX="g++12", DISTCHECK="t", ), - args="--with-flux-security --enable-caliper", + args="--with-flux-security", test_s3=True, ) @@ -297,7 +295,7 @@ def __str__(self): image="bookworm", coverage_flags="ci-basic", coverage=True, - args="--with-flux-security --enable-caliper", + args="--with-flux-security", ) # RHEL8 clone @@ -326,7 +324,7 @@ def __str__(self): image="el8", coverage=True, command_args="--system", - args="--with-flux-security --enable-caliper", + args="--with-flux-security", ) # inception diff --git a/t/Makefile.am b/t/Makefile.am index 9de229abe489..377e8292ad2d 100644 --- a/t/Makefile.am +++ b/t/Makefile.am @@ -115,7 +115,6 @@ TESTSCRIPTS = \ t1107-heartbeat.t \ t1200-stats-basic.t \ t2004-hydra.t \ - t2007-caliper.t \ t2008-althash.t \ t2010-kvs-snapshot-restore.t \ t2100-job-ingest.t \ diff --git a/t/t2007-caliper.t b/t/t2007-caliper.t deleted file mode 100755 index adf5d322b9e7..000000000000 --- a/t/t2007-caliper.t +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# - -test_description='Test Caliper profiling support - -Test Caliper support.' - -# Append --logfile option if FLUX_TESTS_LOGFILE is set in environment: -test -n "$FLUX_TESTS_LOGFILE" && set -- "$@" --logfile -. `dirname $0`/sharness.sh - -# Check for built in caliper tests - -if ! flux start --noexec --caliper-profile=thread-trace ; then - skip_all='skipping Caliper tests, Flux not built with Caliper support' - test_done -fi - -test_expect_success '--caliper-profile works' ' - flux start --caliper-profile=thread-trace /bin/true -' - -CALIPER_OUTPUT=$(echo *.cali) -test_expect_success 'caliper output file exists' ' - test -f "$CALIPER_OUTPUT" -' - -which cali-query >/dev/null 2>&1 && test_set_prereq HAVE_CALI_QUERY -test_expect_success HAVE_CALI_QUERY 'caliper output file is readable by cali-query' ' - cali-query "$CALIPER_OUTPUT" -' - -test_done