On Mon, Aug 23, 2010 at 02:46:09PM +0200, Anders Logg wrote: > This seems to be the remaining issue to fix on Mac. > > The UMFPACK test program failed because of missing references to AMD > so I added AMD. > > Now it complains about missing BLAS. > > Should we add the tests for AMD/BLAS as part of the UMFPACK script or > is there a better way?
This should be fixed now. -- Anders Return-Path: <[email protected]> Received: from mail-imap5.uio.no ([unix socket]) by mail-imap5.uio.no (Cyrus v2.3.16) with LMTPA; Mon, 23 Aug 2010 14:42:28 +0200 X-Sieve: CMU Sieve 2.3 Delivery-date: Mon, 23 Aug 2010 14:42:28 +0200 Received: from mail-mx1.uio.no ([129.240.10.29]) by mail-imap5.uio.no with esmtp (Exim 4.69) (envelope-from <[email protected]>) id 1OnWM8-0007Yb-SM for [email protected]; Mon, 23 Aug 2010 14:42:28 +0200 Received: from adelie.canonical.com ([91.189.90.139]) by mail-mx1.uio.no with esmtp (Exim 4.69) (envelope-from <[email protected]>) id 1OnWM8-0005bW-B1 for [email protected]; Mon, 23 Aug 2010 14:42:28 +0200 Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OnWM7-0001Pa-3r for <[email protected]>; Mon, 23 Aug 2010 13:42:27 +0100 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 42DBA2E8068 for <[email protected]>; Mon, 23 Aug 2010 13:42:26 +0100 (BST) Content-Type: multipart/mixed; boundary="===============6444500910668607450==" MIME-Version: 1.0 X-Launchpad-Project: dolfin X-Launchpad-Branch: ~dolfin-core/dolfin/main X-Launchpad-Message-Rationale: Subscriber @dolfin-core X-Launchpad-Branch-Revision-Number: 5067 X-Launchpad-Notification-Type: branch-revision To: Anders Logg <[email protected]> From: [email protected] Subject: [Branch ~dolfin-core/dolfin/main] Rev 5067: Work on UMFPACK config, closer to working on Mac. Added AMD but BLAS still missing. Message-Id: <[email protected]> Date: Mon, 23 Aug 2010 12:42:26 -0000 Reply-To: [email protected] Sender: [email protected] Errors-To: [email protected] Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="None"; Instance="initZopeless config overlay" X-Launchpad-Hash: 8ee99498b04c43bd16e5464ff9691c932d0201a5 X-UiO-MailScanner: No virus found X-UiO-Spam-info: not spam, SpamAssassin (score=-0.7, required=5.0, autolearn=disabled, RCVD_IN_DNSWL_LOW=-0.7, T_RP_MATCHES_RCVD=-0.01, uiobl=NO, uiouri=NO) X-UiO-Scanned: 395F1D542E01836BF0DF4506286BBE253A0B945F X-UiO-SPAM-Test: remote_host: 91.189.90.139 spam_score: -6 maxlevel 30 minaction 1 bait 0 mail/h: 63 total 30292 max/h 214 blacklist 0 greylist 0 ratelimit 0 > > ------------------------------------------------------------ > revno: 5067 > committer: Anders Logg <[email protected]> > branch nick: dolfin > timestamp: Mon 2010-08-23 14:35:25 +0200 > message: > Work on UMFPACK config, closer to working on Mac. Added AMD but BLAS still > missing. > modified: > cmake/FindUMFPACK.cmake > > > === modified file 'cmake/FindUMFPACK.cmake' > --- cmake/FindUMFPACK.cmake 2010-08-23 11:45:00 +0000 > +++ cmake/FindUMFPACK.cmake 2010-08-23 12:35:25 +0000 > @@ -1,15 +1,22 @@ > +# - Try to find UMFPACK (and AMD) > +# Once done this will define > +# > +# UMFPACK_FOUND - system has UMFPACK > +# UMFPACK_INCLUDE_DIRS - include directories for UMFPACK > +# UMFPACK_LIBRARIES - libraries for UMFPACK > + > message(STATUS "Checking for package 'UMFPACK'") > > # Check for header file > -find_path(UMFPACK_INCLUDE_DIR > +find_path(UMFPACK_INCLUDE_DIRS > NAMES umfpack.h > PATHS $ENV{UMFPACK_DIR} > - PATH_SUFFIXES suitesparse > + PATH_SUFFIXES suitesparse ufsparse > DOC "Directory where the UMFPACK header is located" > ) > -mark_as_advanced(UMFPACK_INCLUDE_DIR) > +mark_as_advanced(UMFPACK_INCLUDE_DIRS) > > -# Check for library > +# Check for UMFPACK library > find_library(UMFPACK_LIBRARY > NAMES umfpack > PATHS $ENV{UMFPACK_DIR}/lib > @@ -17,12 +24,23 @@ > ) > mark_as_advanced(UMFPACK_LIBRARY) > > +# Check for AMD library > +find_library(AMD_LIBRARY > + NAMES amd > + PATHS $ENV{UMFPACK_DIR}/lib > + DOC "The AMD library (required for UMFPACK)" > + ) > +mark_as_advanced(AMD_LIBRARY) > + > +# Collect libraries > +set(UMFPACK_LIBRARIES "${UMFPACK_LIBRARY};${AMD_LIBRARY}") > + > # Try compiling and running test program > -if (UMFPACK_INCLUDE_DIR AND UMFPACK_LIBRARY) > +if (UMFPACK_INCLUDE_DIRS AND UMFPACK_LIBRARIES) > > # Set flags for building test program > - set(CMAKE_REQUIRED_INCLUDES ${UMFPACK_INCLUDE_DIR}) > - set(CMAKE_REQUIRED_LIBRARIES ${UMFPACK_LIBRARY}) > + set(CMAKE_REQUIRED_INCLUDES ${UMFPACK_INCLUDE_DIRS}) > + set(CMAKE_REQUIRED_LIBRARIES ${UMFPACK_LIBRARIES}) > > # Build and run test program > include(CheckCXXSourceRuns) > @@ -60,4 +78,4 @@ > include(FindPackageHandleStandardArgs) > find_package_handle_standard_args(UMFPACK > "UMFPACK could not be found. Be sure to set UMFPACK_DIR." > - UMFPACK_INCLUDE_DIR UMFPACK_LIBRARY UMFPACK_TEST_RUNS) > + UMFPACK_INCLUDE_DIRS UMFPACK_LIBRARIES UMFPACK_TEST_RUNS) > > _______________________________________________ > Mailing list: https://launchpad.net/~dolfin > Post to : [email protected] > Unsubscribe : https://launchpad.net/~dolfin > More help : https://help.launchpad.net/ListHelp -- Anders _______________________________________________ Mailing list: https://launchpad.net/~dolfin Post to : [email protected] Unsubscribe : https://launchpad.net/~dolfin More help : https://help.launchpad.net/ListHelp
