Skip to content
This repository has been archived by the owner on Apr 18, 2024. It is now read-only.

Commit

Permalink
Merge pull request #2 from JuliaOpt/tes
Browse files Browse the repository at this point in the history
Monolithic build and symbol export
  • Loading branch information
juan-pablo-vielma authored Oct 28, 2019
2 parents 1f9c68d + 0cb342c commit c6d371e
Show file tree
Hide file tree
Showing 12 changed files with 579 additions and 72 deletions.
319 changes: 247 additions & 72 deletions build_tarballs.jl

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions bundled/asl-extra/arith.h.aarch64-linux-gnu
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#define IEEE_8087
#define Arith_Kind_ASL 1
#define Long int
#define Intcast (int)(long)
#define Double_Align
#define X64_bit_pointers
#define QNaN0 0x0
#define QNaN1 0x7ff80000
5 changes: 5 additions & 0 deletions bundled/asl-extra/arith.h.arm-linux-gnueabihf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#define IEEE_8087
#define Arith_Kind_ASL 1
#define Double_Align
#define QNaN0 0x0
#define QNaN1 0x7ff80000
4 changes: 4 additions & 0 deletions bundled/asl-extra/arith.h.i686-linux-gnu
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#define IEEE_8087
#define Arith_Kind_ASL 1
#define QNaN0 0x0
#define QNaN1 0xfff80000
5 changes: 5 additions & 0 deletions bundled/asl-extra/arith.h.i686-w64-mingw32
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#define IEEE_8087
#define Arith_Kind_ASL 1
#define Double_Align
#define QNaN0 0x0
#define QNaN1 0xfff80000
8 changes: 8 additions & 0 deletions bundled/asl-extra/arith.h.powerpc64le-linux-gnu
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#define IEEE_8087
#define Arith_Kind_ASL 1
#define Long int
#define Intcast (int)(long)
#define Double_Align
#define X64_bit_pointers
#define QNaN0 0x0
#define QNaN1 0x7ff80000
8 changes: 8 additions & 0 deletions bundled/asl-extra/arith.h.x86_64-apple-darwin14
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#define IEEE_8087
#define Arith_Kind_ASL 1
#define Long int
#define Intcast (int)(long)
#define Double_Align
#define X64_bit_pointers
#define QNaN0 0x0
#define QNaN1 0x7ff80000
8 changes: 8 additions & 0 deletions bundled/asl-extra/arith.h.x86_64-linux-gnu
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#define IEEE_8087
#define Arith_Kind_ASL 1
#define Long int
#define Intcast (int)(long)
#define Double_Align
#define X64_bit_pointers
#define QNaN0 0x0
#define QNaN1 0xfff80000
8 changes: 8 additions & 0 deletions bundled/asl-extra/arith.h.x86_64-w64-mingw32
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#define IEEE_8087
#define Arith_Kind_ASL 1
#define Long int
#define Intcast (int)(long)
#define Double_Align
#define X64_bit_pointers
#define QNaN0 0x0
#define QNaN1 0xfff80000
240 changes: 240 additions & 0 deletions bundled/asl-extra/expr-info.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,240 @@
// This file is automatically generated. Do not edit!

#include "mp/common.h"
#include "expr-writer.h"

const mp::internal::OpCodeInfo mp::internal::OpCodeInfo::INFO[] = {
{expr::ADD, expr::FIRST_BINARY},
{expr::SUB, expr::FIRST_BINARY},
{expr::MUL, expr::FIRST_BINARY},
{expr::DIV, expr::FIRST_BINARY},
{expr::MOD, expr::FIRST_BINARY},
{expr::POW, expr::FIRST_BINARY},
{expr::LESS, expr::FIRST_BINARY},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::MIN, expr::FIRST_VARARG},
{expr::MAX, expr::FIRST_VARARG},
{expr::FLOOR, expr::FIRST_UNARY},
{expr::CEIL, expr::FIRST_UNARY},
{expr::ABS, expr::FIRST_UNARY},
{expr::MINUS, expr::FIRST_UNARY},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::OR, expr::FIRST_BINARY_LOGICAL},
{expr::AND, expr::FIRST_BINARY_LOGICAL},
{expr::LT, expr::FIRST_RELATIONAL},
{expr::LE, expr::FIRST_RELATIONAL},
{expr::EQ, expr::FIRST_RELATIONAL},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::GE, expr::FIRST_RELATIONAL},
{expr::GT, expr::FIRST_RELATIONAL},
{expr::NE, expr::FIRST_RELATIONAL},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::NOT, expr::NOT},
{expr::IF, expr::IF},
{expr::UNKNOWN, expr::UNKNOWN},
{expr::TANH, expr::FIRST_UNARY},
{expr::TAN, expr::FIRST_UNARY},
{expr::SQRT, expr::FIRST_UNARY},
{expr::SINH, expr::FIRST_UNARY},
{expr::SIN, expr::FIRST_UNARY},
{expr::LOG10, expr::FIRST_UNARY},
{expr::LOG, expr::FIRST_UNARY},
{expr::EXP, expr::FIRST_UNARY},
{expr::COSH, expr::FIRST_UNARY},
{expr::COS, expr::FIRST_UNARY},
{expr::ATANH, expr::FIRST_UNARY},
{expr::ATAN2, expr::FIRST_BINARY},
{expr::ATAN, expr::FIRST_UNARY},
{expr::ASINH, expr::FIRST_UNARY},
{expr::ASIN, expr::FIRST_UNARY},
{expr::ACOSH, expr::FIRST_UNARY},
{expr::ACOS, expr::FIRST_UNARY},
{expr::SUM, expr::SUM},
{expr::TRUNC_DIV, expr::FIRST_BINARY},
{expr::PRECISION, expr::FIRST_BINARY},
{expr::ROUND, expr::FIRST_BINARY},
{expr::TRUNC, expr::FIRST_BINARY},
{expr::COUNT, expr::COUNT},
{expr::NUMBEROF, expr::NUMBEROF},
{expr::NUMBEROF_SYM, expr::NUMBEROF_SYM},
{expr::ATLEAST, expr::FIRST_LOGICAL_COUNT},
{expr::ATMOST, expr::FIRST_LOGICAL_COUNT},
{expr::PLTERM, expr::PLTERM},
{expr::IFSYM, expr::IFSYM},
{expr::EXACTLY, expr::FIRST_LOGICAL_COUNT},
{expr::NOT_ATLEAST, expr::FIRST_LOGICAL_COUNT},
{expr::NOT_ATMOST, expr::FIRST_LOGICAL_COUNT},
{expr::NOT_EXACTLY, expr::FIRST_LOGICAL_COUNT},
{expr::FORALL, expr::FIRST_ITERATED_LOGICAL},
{expr::EXISTS, expr::FIRST_ITERATED_LOGICAL},
{expr::IMPLICATION, expr::IMPLICATION},
{expr::IFF, expr::FIRST_BINARY_LOGICAL},
{expr::ALLDIFF, expr::FIRST_PAIRWISE},
{expr::NOT_ALLDIFF, expr::FIRST_PAIRWISE},
{expr::POW_CONST_EXP, expr::FIRST_BINARY},
{expr::POW2, expr::FIRST_UNARY},
{expr::POW_CONST_BASE, expr::FIRST_BINARY},
{expr::CALL, expr::CALL},
{expr::NUMBER, expr::NUMBER},
{expr::STRING, expr::STRING},
{expr::VARIABLE, expr::VARIABLE}
};

const mp::internal::ExprInfo mp::internal::ExprInfo::INFO[] = {
{-1, "unknown"},
{80, "number"},
{82, "variable"},
{-1, "common expression"},
{16, "unary -"},
{15, "abs"},
{13, "floor"},
{14, "ceil"},
{39, "sqrt"},
{77, "^2"},
{44, "exp"},
{43, "log"},
{42, "log10"},
{41, "sin"},
{40, "sinh"},
{46, "cos"},
{45, "cosh"},
{38, "tan"},
{37, "tanh"},
{51, "asin"},
{50, "asinh"},
{53, "acos"},
{52, "acosh"},
{49, "atan"},
{47, "atanh"},
{0, "+"},
{1, "-"},
{6, "less"},
{2, "*"},
{3, "/"},
{55, "div"},
{4, "mod"},
{5, "^"},
{78, "^"},
{76, "^"},
{48, "atan2"},
{56, "precision"},
{57, "round"},
{58, "trunc"},
{35, "if"},
{64, "piecewise-linear term"},
{79, "function call"},
{11, "min"},
{12, "max"},
{54, "sum"},
{60, "numberof"},
{61, "symbolic numberof"},
{59, "count"},
{80, "bool"},
{34, "!"},
{20, "||"},
{21, "&&"},
{73, "<==>"},
{22, "<"},
{23, "<="},
{24, "="},
{28, ">="},
{29, ">"},
{30, "!="},
{62, "atleast"},
{63, "atmost"},
{66, "exactly"},
{67, "!atleast"},
{68, "!atmost"},
{69, "!exactly"},
{72, "==>"},
{71, "exists"},
{70, "forall"},
{74, "alldiff"},
{75, "!alldiff"},
{81, "string"},
{65, "symbolic if"}
};

const mp::prec::Precedence mp::expr::PrecInfo::INFO[] = {
prec::UNKNOWN,
prec::PRIMARY,
prec::PRIMARY,
prec::PRIMARY,
prec::UNARY,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::EXPONENTIATION,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::ADDITIVE,
prec::ADDITIVE,
prec::ADDITIVE,
prec::MULTIPLICATIVE,
prec::MULTIPLICATIVE,
prec::MULTIPLICATIVE,
prec::MULTIPLICATIVE,
prec::EXPONENTIATION,
prec::EXPONENTIATION,
prec::EXPONENTIATION,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CONDITIONAL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::ITERATIVE,
prec::CALL,
prec::CALL,
prec::CALL,
prec::PRIMARY,
prec::NOT,
prec::LOGICAL_OR,
prec::LOGICAL_AND,
prec::IFF,
prec::RELATIONAL,
prec::RELATIONAL,
prec::RELATIONAL,
prec::RELATIONAL,
prec::RELATIONAL,
prec::RELATIONAL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::IMPLICATION,
prec::CALL,
prec::CALL,
prec::CALL,
prec::CALL,
prec::PRIMARY,
prec::CONDITIONAL
};
18 changes: 18 additions & 0 deletions bundled/asl-extra/no_benchmark.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 523faa7f..be88636d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -381,13 +381,6 @@ foreach (module ${MP_MODULES})
endif ()
endforeach ()

-if (MP_VARIADIC_TEMPLATES AND HAVE_ATOMIC)
- option(BENCHMARK_ENABLE_TESTING
- "Enable testing of the benchmark library." OFF)
- add_subdirectory(thirdparty/benchmark)
- enable_cxx11(benchmark)
-endif ()
-
enable_testing()
add_subdirectory(test)

20 changes: 20 additions & 0 deletions bundled/mumps-extra/quiet.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
index af0b62a..55e372e 100644
--- a/MUMPS/src/dmumps_part1.F
+++ b/MUMPS/src/dmumps_part1.F
@@ -104,16 +104,6 @@ C matrix in assembled format (ICNTL(5)=0, and ICNTL(18) $\neq$ 3),
MPG = id%ICNTL(3)
PROK = ((MP.GT.0).AND.(id%ICNTL(4).GE.3))
PROKG = ( MPG .GT. 0 .and. id%MYID .eq. MASTER )
- IF (PROKG) THEN
- IF (id%ICNTL(5) .NE. 1) THEN
- WRITE(MPG,'(A,I4,I12,I15)')
- & 'Entering DMUMPS driver with JOB, N, NZ =', JOB,N,NZ
- ELSE
- WRITE(MPG,'(A,I4,I12,I15)')
- & 'Entering DMUMPS driver with JOB, N, NELT =', JOB,N
- & ,NELT
- ENDIF
- ENDIF
ELSE
MPG = 0
PROK = .FALSE.

0 comments on commit c6d371e

Please sign in to comment.