Small changes to enable compulition on Windows with Visual C++.
This commit is contained in:
parent
884470b1ce
commit
06916c815c
@ -23,11 +23,13 @@ double SuperLU_timer_() {
|
|||||||
#else
|
#else
|
||||||
|
|
||||||
#ifndef NO_TIMER
|
#ifndef NO_TIMER
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/times.h>
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#ifndef WIN32
|
||||||
|
#include <sys/times.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef CLK_TCK
|
#ifndef CLK_TCK
|
||||||
#define CLK_TCK 60
|
#define CLK_TCK 60
|
||||||
|
|||||||
@ -24,8 +24,10 @@
|
|||||||
#include "shellSort_dh.h"
|
#include "shellSort_dh.h"
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef WIN32
|
||||||
/* for debugging only! */
|
/* for debugging only! */
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
static void init_seq_private(SubdomainGraph_dh s, int blocks, bool bj, void *A);
|
static void init_seq_private(SubdomainGraph_dh s, int blocks, bool bj, void *A);
|
||||||
static void init_mpi_private(SubdomainGraph_dh s, int blocks, bool bj, void *A);
|
static void init_mpi_private(SubdomainGraph_dh s, int blocks, bool bj, void *A);
|
||||||
|
|||||||
@ -53,7 +53,7 @@ int hypre_F90_NAME_LAPACK(dgels, DGELS)(char *, int *, int *, int *, double *, i
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
static void bzero(char *a, int n) {int i: for (i=0; i<n; i++) {a[i]=0;}}
|
static void bzero(char *a, int n) {int i; for (i=0; i<n; i++) {a[i]=0;}}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -18,6 +18,11 @@
|
|||||||
*====================*/
|
*====================*/
|
||||||
#include <headers.h>
|
#include <headers.h>
|
||||||
|
|
||||||
|
/* TK: a hack to make this compile on Windows */
|
||||||
|
#ifdef WIN32
|
||||||
|
#define drand48 rand
|
||||||
|
#endif
|
||||||
|
|
||||||
#define RelaxScheme1 3 /* cr type */
|
#define RelaxScheme1 3 /* cr type */
|
||||||
#define fptOmegaJac 1 /* 1 is f pt weighted jacobi */
|
#define fptOmegaJac 1 /* 1 is f pt weighted jacobi */
|
||||||
#define omega1 1.0 /* weight */
|
#define omega1 1.0 /* weight */
|
||||||
|
|||||||
@ -23,10 +23,6 @@
|
|||||||
|
|
||||||
#include "HYPRE_config.h"
|
#include "HYPRE_config.h"
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
#include "mkl.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(F77_FUNC_)
|
#if defined(F77_FUNC_)
|
||||||
/* F77_FUNC_ macro assumes underscores exist in name */
|
/* F77_FUNC_ macro assumes underscores exist in name */
|
||||||
# define hypre_NAME_C_CALLING_FORT(name,NAME) F77_FUNC_(name,NAME)
|
# define hypre_NAME_C_CALLING_FORT(name,NAME) F77_FUNC_(name,NAME)
|
||||||
|
|||||||
@ -23,8 +23,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <unistd.h>
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
|
#include <unistd.h>
|
||||||
#include <sys/times.h>
|
#include <sys/times.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef TIMER_USE_MPI
|
#ifdef TIMER_USE_MPI
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user