Skip to content

Commit

Permalink
Merge pull request #277 from insertinterestingnamehere/drop_os
Browse files Browse the repository at this point in the history
Drop Various Rare OSs and Remove Unnecessary Config Checks
  • Loading branch information
insertinterestingnamehere committed Sep 19, 2024
2 parents dcbd749 + 4b2d32b commit d8f6156
Show file tree
Hide file tree
Showing 98 changed files with 178 additions and 5,806 deletions.
5 changes: 5 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
./autogen.sh
./configure --enable-picky --with-scheduler=<< parameters.scheduler >> --with-topology=<< parameters.topology >>
make -j2
make tests -j2
- run:
command: timeout --foreground -k 10s 2m make check
no_output_timeout: 60s
Expand Down Expand Up @@ -55,6 +56,7 @@ jobs:
./autogen.sh
./configure --enable-picky --with-scheduler=<< parameters.scheduler >> -with-topology=<< parameters.topology >>
make -j2
make tests -j2
- run:
command: timeout --foreground -k 10s 2m make check
no_output_timeout: 60s
Expand Down Expand Up @@ -92,6 +94,7 @@ jobs:
./autogen.sh
./configure --enable-picky --with-scheduler=<< parameters.scheduler >> -with-topology=<< parameters.topology >>
make -j2
make tests -j2
- run:
command: timeout --foreground -k 10s 4m make check
no_output_timeout: 120s
Expand Down Expand Up @@ -127,6 +130,7 @@ jobs:
./autogen.sh
./configure --enable-picky --with-scheduler=<< parameters.scheduler >> -with-topology=<< parameters.topology >>
make -j2
make tests -j2
- run:
command: |
export PATH=$PATH:/opt/arm/arm-linux-compiler-24.04_Ubuntu-22.04/bin
Expand All @@ -152,6 +156,7 @@ jobs:
bash autogen.sh
bash configure --enable-picky --with-scheduler=<< parameters.scheduler >> -with-topology=<< parameters.topology >>
make -j2
make tests -j2
- run:
command: make check
no_output_timeout: 60s
Expand Down
13 changes: 10 additions & 3 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,17 @@ osx_m1_task:
brew install autoconf automake libtool coreutils # coreutils is to get gtimeout for CI and is not universally required by qthreads.
if [ "$QTHREADS_TOPOLOGY" != "no" ]; then brew install hwloc; fi
build_script: |
export CFLAGS="-I$(brew --prefix)/include $CFLAGS"
export CXXFLAGS="-I$(brew --prefix)/include $CXXFLAGS"
export LDFLAGS="-L$(brew --prefix)/lib $LDFLAGS"
export CFLAGS="-g -I$(brew --prefix)/include $CFLAGS"
export CXXFLAGS="-g -I$(brew --prefix)/include $CXXFLAGS"
export LDFLAGS="-g -L$(brew --prefix)/lib $LDFLAGS"
./autogen.sh
./configure --enable-picky --with-scheduler=$QTHREADS_SCHEDULER --with-topology=$QTHREADS_TOPOLOGY
make -j$CIRRUS_CPU
make tests -j$CIRRUS_CPU
test_script: |
# commented example for how to get a backtrace from CI usign lldb on OSX:
#echo "settings set target.process.stop-on-exec false" > ~/.lldbinit
#QT_NUM_SHEPHERDS=2 QT_NUM_WORKERS_PER_SHEPHERD=1 lldb bash --batch --one-line 'process launch' --one-line-on-crash 'bt' --one-line-on-crash 'quit' -- test/basics/hello_world
gtimeout --foreground 3m make check
freebsd_task:
Expand All @@ -62,6 +66,7 @@ freebsd_task:
bash autogen.sh
bash configure --enable-picky --with-scheduler=$QTHREADS_SCHEDULER --with-topology=no
make -j$CIRRUS_CPU
make tests -j$CIRRUS_CPU
test_script: |
gtimeout --foreground -k 10s 2m make check
Expand Down Expand Up @@ -105,6 +110,7 @@ arm_linux_task:
./autogen.sh
./configure --enable-picky --with-scheduler=$QTHREADS_SCHEDULER --with-topology=$QTHREADS_TOPOLOGY
make -j$CIRRUS_CPU
make tests -j$CIRRUS_CPU
test_script: |
timeout --foreground -k 10s 2m make check
Expand Down Expand Up @@ -160,6 +166,7 @@ arm_linux_clang_task:
./autogen.sh
./configure --enable-picky --with-scheduler=$QTHREADS_SCHEDULER --with-topology=$QTHREADS_TOPOLOGY
make -j$CIRRUS_CPU
make tests -j$CIRRUS_CPU
test_script: |
timeout --foreground -k 10s 2m make check
14 changes: 13 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
./autogen.sh
./configure --enable-picky --with-scheduler=${{ matrix.scheduler }} --with-topology=${{ matrix.topology }}
make -j2
make tests -j2
- name: make check
run: timeout -k 10s --foreground 3m make check
timeout-minutes: 4
Expand Down Expand Up @@ -80,6 +81,7 @@ jobs:
./autogen.sh
./configure --enable-picky --with-scheduler=${{ matrix.scheduler }} --with-topology=${{ matrix.topology }}
make -j2
make tests -j2
- name: make check
run: timeout -k 10s --foreground 6m make check
timeout-minutes: 7
Expand Down Expand Up @@ -117,6 +119,7 @@ jobs:
./autogen.sh
./configure --enable-picky --with-scheduler=${{ matrix.scheduler }} --with-topology=${{ matrix.topology }} || cat config.log
make -j2
make tests -j2
- name: make check
run: |
source /opt/intel/oneapi/setvars.sh
Expand Down Expand Up @@ -157,6 +160,7 @@ jobs:
./autogen.sh
./configure --enable-picky --with-scheduler=${{ matrix.scheduler }} --with-topology=${{ matrix.topology }} || cat config.log
make -j2
make tests -j2
- name: make check
run: |
source /opt/intel/oneapi/setvars.sh
Expand Down Expand Up @@ -193,6 +197,7 @@ jobs:
./autogen.sh
./configure --enable-picky --with-scheduler=${{ matrix.scheduler }} --with-topology=${{ matrix.topology }} || cat config.log
make -j2
make tests -j2
- name: make check
run: |
timeout -k 10s --foreground 6m make check
Expand Down Expand Up @@ -225,8 +230,13 @@ jobs:
./autogen.sh
./configure $QTHREADS_ENABLE_ASSERTS --enable-picky --with-scheduler=${{ matrix.scheduler }} --with-topology=${{ matrix.topology }}
make -j3
make tests -j3
- name: make check
run: gtimeout -k 10s --foreground 8m make check
run: |
# commented example for how to get a backtrace from CI usign lldb on OSX:
#echo "settings set target.process.stop-on-exec false" > ~/.lldbinit
#QT_NUM_SHEPHERDS=2 QT_NUM_WORKERS_PER_SHEPHERD=1 lldb bash --batch --one-line 'process launch' --one-line-on-crash 'bt' --one-line-on-crash 'quit' -- test/basics/hello_world
gtimeout -k 10s --foreground 8m make check
timeout-minutes: 9

sanitizers:
Expand Down Expand Up @@ -268,6 +278,7 @@ jobs:
./autogen.sh
./configure --enable-picky --with-scheduler=${{ matrix.scheduler }} --with-topology=${{ matrix.topology }}
make -j2
make tests -j2
- name: make check
run: timeout -k 10s --foreground 8m make check
timeout-minutes: 9
Expand Down Expand Up @@ -311,6 +322,7 @@ jobs:
./autogen.sh
./configure $QTHREADS_ENABLE_ASSERTS --enable-picky --with-scheduler=${{ matrix.scheduler }} --with-topology=${{ matrix.topology }}
make -j2
make tests -j2
- name: make check
run: timeout -k 10s --foreground 6m make check
timeout-minutes: 7
10 changes: 0 additions & 10 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,9 @@
# Copyright (c) 2008 Sandia Corporation
#

# The config files here are included because, if I build the distribution
# tarball with AC 2.60 or better, they aren't included by acinclude.m4; but I
# want them distributed in case someone with AC 2.59 wants to run autoreconf
EXTRA_DIST = \
config/ac_prog_cc_c99.m4 \
config/ac_prog_sed.m4 \
config/ac_use_system_extensions.m4 \
README.md \
README.affinity \
README.multinode \
README.performance-monitoring.md \
SCHEDULING \
TODO.md \
Expand Down Expand Up @@ -43,9 +36,6 @@ featuretests: core
stresstests: core
$(MAKE) -C test stresstests

multinodetests: core
$(MAKE) -C test multinodetests

buildtests: tests

tests:
Expand Down
2 changes: 1 addition & 1 deletion README.affinity
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ machine, the better decisions can be made about affinity.

The best-supported library is hwloc, which provides a full set of topology
querying and thread- and memory-pinning functions on the widest variety of
platforms, including Linux, BSD, HP-UX, and more. When using hwloc, the default
platforms, including Linux, BSD, and more. When using hwloc, the default
arrangement is to pin each worker thread to a PU (the lowest level
computational processing unit), and to group them (for the Sherwood scheduler)
by the top-level cache.
Expand Down
54 changes: 0 additions & 54 deletions README.multinode

This file was deleted.

10 changes: 0 additions & 10 deletions acinclude.m4

This file was deleted.

116 changes: 0 additions & 116 deletions config/ac_compile_check_sizeof.m4

This file was deleted.

Loading

0 comments on commit d8f6156

Please sign in to comment.