Skip to content

Commit

Permalink
restore MSVC support to julia.h file (#44842)
Browse files Browse the repository at this point in the history 
Put back a few lines that were removed by PR $42703 because they are required to successfully embed Julia with MSVC.
  • Loading branch information
@Taaitaaiger
Taaitaaiger authored Apr 4, 2022
1 parent 62dd14e commit 209aad1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/support/dtypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,13 @@
# define NOINLINE_DECL(f) f __attribute__((noinline))
#endif

#if defined(__GNUC__)
#ifdef _COMPILER_MICROSOFT_
# ifdef _P64
# define JL_ATTRIBUTE_ALIGN_PTRSIZE(x) __declspec(align(8)) x
# else
# define JL_ATTRIBUTE_ALIGN_PTRSIZE(x) __declspec(align(4)) x
# endif
#elif defined(__GNUC__)
# define JL_ATTRIBUTE_ALIGN_PTRSIZE(x) x __attribute__ ((aligned (sizeof(void*))))
#else
# define JL_ATTRIBUTE_ALIGN_PTRSIZE(x)
Expand Down
2 changes: 2 additions & 0 deletions src/support/platform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#define _COMPILER_CLANG_
#elif defined(__GNUC__)
#define _COMPILER_GCC_
#elif defined(_MSC_VER)
#define _COMPILER_MICROSOFT_
#else
#error Unsupported compiler
#endif
Expand Down

7 comments on commit 209aad1

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Executing the daily package evaluation, I will reply here when finished:

@nanosoldier runtests(ALL, isdaily = true)

@vtjnash
Copy link
Member

@vtjnash vtjnash commented on 209aad1 Apr 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nanosoldier runbenchmarks(ALL, isdaily = true)

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your benchmark job has completed - possible performance regressions were detected. A full report can be found here.

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your package evaluation job has completed - possible new issues were detected. A full report can be found here.

@vtjnash
Copy link
Member

@vtjnash vtjnash commented on 209aad1 Apr 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nanosoldier runbenchmarks("reduction" || "union", vs="@3e1ae47eef0b99915862d2caf4e33a4c68aa7cfd")

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your benchmark job has completed - possible performance regressions were detected. A full report can be found here.

@vtjnash
Copy link
Member

@vtjnash vtjnash commented on 209aad1 Apr 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like some good improvements to the sort times:

["union", "array", ("sort", "BigInt", 0)] | 0.92 (5%) ✅ | 1.00 (1%)
["union", "array", ("sort", "Bool", 0)] | 0.07 (5%) ✅ | 0.99 (1%)
["union", "array", ("sort", "Float32", 0)] | 0.25 (5%) ✅ | 2.11 (1%) ❌
["union", "array", ("sort", "Float64", 0)] | 0.68 (5%) ✅ | 2.11 (1%) ❌
["union", "array", ("sort", "Int64", 0)] | 0.79 (5%) ✅ | 2.11 (1%) ❌
["union", "array", ("sort", "Int8", 0)] | 0.03 (5%) ✅ | 1.21 (1%)

Please sign in to comment.