28 Commits
v0.1 ... v0.3

Author SHA1 Message Date
e2aedab3b0 Added new entry. 2016-12-10 17:12:58 +01:00
bc8b48dd29 Updated info for v0.3 2016-12-10 17:12:00 +01:00
dab78093ab Deleted macros 2016-12-10 17:11:21 +01:00
a782bdb57d Organized TODO.md 2016-12-10 15:31:04 +01:00
9157d15383 Added goals for v0.3 2016-12-10 15:30:51 +01:00
f1fd758bfc Added entry for v0.2.1 (which I had previously forgotten). 2016-12-10 14:54:12 +01:00
66c0a5d027 Added a TODO list. 2016-12-10 14:54:00 +01:00
f4ee9872bc Optimize the algorithm to avoid numbers larger than half. 2016-12-10 14:46:51 +01:00
8a42e85d04 Better explanation of error. 2016-12-10 11:51:32 +01:00
dd38b53e31 Fixed leaks. 2016-12-10 11:20:01 +01:00
3c8b9922fb Shorten the long ass `unsigned long long int' to ulli. 2016-12-10 02:20:57 +01:00
cb9e1648e9 No need to use that macro outside a loop. 2016-12-10 02:09:34 +01:00
30703314dd Forgot it for the main loop as well. 2016-12-10 01:15:52 +01:00
4905391c82 Add more optimizations. 2016-12-10 00:50:23 +01:00
d757f3a79f Added section for v0.2 2016-12-09 23:26:27 +01:00
79a9ba11ff Switch to C, stop using OpenMP, start using GMP. 2016-12-09 23:02:51 +01:00
05c50652b8 Added GMP as a deps for CI. 2016-12-02 16:35:07 +01:00
7d6ed15523 We only have to define the universal CXX flags once. 2016-12-02 16:34:12 +01:00
b66755174f GMP is a new dependency. 2016-12-02 16:31:12 +01:00
04a8d7ddde Downgrade to C++11 to support g++4.8 2016-12-02 15:55:29 +01:00
6bfab05e37 Use lambda function instead. 2016-12-01 12:35:15 +01:00
05b6257e44 Skip all even numbers since they're all divisible by 2. 2016-12-01 12:21:09 +01:00
1593e57e90 CMake check for OpenMP 2016-11-30 22:20:46 +01:00
75b35b3356 Fixed seg fault (I think). 2016-11-30 21:37:10 +01:00
3bb757dc0d Basic multi-core capabilities.
It's buggy, at some point it gives a segmentation fault at around the
`for(auto i : primes)` part. I think I should add a pragma critical
there.
2016-11-30 21:08:44 +01:00
1032e099a1 Added Vim swap files to gitignore. 2016-11-30 20:34:06 +01:00
a236f88d12 Added libgomp to dependencies. 2016-11-30 19:10:00 +01:00
87b96e4ebc Added OpenMP to the project. 2016-11-30 19:09:29 +01:00
12 changed files with 251 additions and 49 deletions

3
.gitignore vendored
View File

@ -1,3 +1,6 @@
# Ignore build files
build/*
!build/.keep
# Ignore vim temporary files
*.sw[a-z]

View File

@ -2,12 +2,19 @@ image: gcc
build:
stage: build
# Install dependencies
before_script:
- apt update && apt -y install cmake
- apt update && apt -y install cmake libgmp-dev
# Build the project
script:
- cd build/
- cmake -DCMAKE_BUILD_TYPE=Release ..
- make
# Find the resulting binary
artifacts:
paths:
- build/indivisible
# Cache .o files for faster compiling
cache:
paths:
- "*.o"

View File

@ -4,4 +4,15 @@ Change Log
- v0.1: Initial release
- Basic prime calculation.
- Uses a growing vector of known primes and gets the modulus of the number divided by these primes.
- Uses type `long long` to hold prime numbers.
- Uses type `long long' to hold prime numbers.
- v0.2: Multi-Precision
- Switch to C.
- Uses GNU Multiple Precision library (GMP) to hold prime numbers, allowing for 'infinite' size.
- Add `likely()' and `unlikely()' macros to optimize.
- v0.2.1: Memory Leak Fixes
- Fixed a major memory leak at the end of the program.
- Added more optimizers.
- v0.3: Optimizations
- Algorithm skips half the known primes.
- Removed `likely()' and `unlikely()' macros due to lack of information.
- Improved performance.

View File

@ -1,23 +1,39 @@
cmake_minimum_required(VERSION 2.6)
project(Indivisible)
cmake_policy(SET CMP0012 OLD)
set(TARGET_NAME indivisible)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()
set(SRCS
src/Main.cpp)
set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
${CMAKE_SOURCE_DIR}/cmake/)
set(CMAKE_CXX_FLAGS "-std=c++14 -fno-elide-constructors -pedantic-errors -Wall -Wextra -Werror -Wpedantic -Winit-self -Wmissing-declarations -Wuninitialized -Wfatal-errors")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g -O0")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} -g -O3")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS} -Os")
find_package(GMP REQUIRED)
include_directories(
${GMP_INCLUDE_DIR})
set(SRCS
src/main.c
src/list.c)
# Define the C flags.
set(CMAKE_C_FLAGS "-std=gnu99 -Wall -Wextra -Werror -Wfatal-errors -Wmissing-declarations -pedantic-errors")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g -O0")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS} -g -O3")
set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS} -Os")
if(NOT CMAKE_BUILD_TYPE MATCHES Debug AND NOT CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
add_definitions(-DNDEBUG)
endif()
add_executable(${TARGET_NAME} ${SRCS})
target_link_libraries(${TARGET_NAME}
${GMP_LIBRARY})

View File

@ -2,12 +2,15 @@ Indivisible
===========
[![build status](https://gitlab.com/Deathsbreed/Indivisible/badges/master/build.svg)](https://gitlab.com/Deathsbreed/Indivisible/commits/master)
Indivisible is an optimized prime number generator written in C++.
Indivisible is an optimized prime number generator written in C.
Building
--------
This project uses CMake to build.
There are multiple dependencies to install before compiling the project:
- CMake
- GMP
Once the dependencies are installed you can compile by running the following from the root directory of the project:
```bash
$ cd build/
$ cmake ..

15
TODO.md Normal file
View File

@ -0,0 +1,15 @@
To-Do
=====
A to-do list for the project. Feel free to remove items as you solve them in your pull requests.
Next
----
To-do items to do for the next version:
- Profile code to better use `likely()` and `unlikely()` macros.
Features
--------
Features for future versions (not _Next_) of Indivisible:
- Implement multi-threaded version using OpenCL or OpenMP (whichever works).

24
cmake/FindGMP.cmake Normal file
View File

@ -0,0 +1,24 @@
# SOURCE: http://stackoverflow.com/questions/29307862/error-linking-gmp-library
set(GMP_PREFIX "" CACHE PATH "path ")
find_path(GMP_INCLUDE_DIR gmp.h gmpxx.h
PATHS ${GMP_PREFIX}/include /usr/include /usr/local/include )
find_library(GMP_LIBRARY NAMES gmp libgmp
PATHS ${GMP_PREFIX}/lib /usr/lib /usr/local/lib)
if(GMP_INCLUDE_DIR AND GMP_LIBRARY)
get_filename_component(GMP_LIBRARY_DIR ${GMP_LIBRARY} PATH)
set(GMP_FOUND TRUE)
endif()
if(GMP_FOUND)
if(NOT GMP_FIND_QUIETLY)
MESSAGE(STATUS "Found GMP: ${GMP_LIBRARY}")
endif()
else()
if(GMP_FIND_REQUIRED)
message(FATAL_ERROR "Could not find GMP")
endif()
endif()

View File

@ -1,38 +0,0 @@
#include <iostream>
#include <vector>
#include <csignal>
static bool run;
void leave(int signum);
int main(void) {
std::cout << "Indivisible v0.1\n";
run = true;
signal(SIGINT, leave);
std::vector<unsigned long long> primes;
primes.push_back(2);
unsigned long long num = 2;
while(run) {
bool isPrime = true;
for(auto i : primes) {
if(i > num / 2) break;
if(num % i == 0) isPrime = false;
}
if(isPrime) {
primes.push_back(num);
std::cout << num << std::endl;
}
++num;
}
return 0;
}
void leave(int signum) {
std::cout << "Exiting (" << signum << ")\n";
run = false;
}

44
src/list.c Normal file
View File

@ -0,0 +1,44 @@
#include "list.h"
#include <stdlib.h>
#include <stdio.h>
/**
* This is the number of elements by which the list expands.
* WARNING: Always use doubles for this number (2^X)
*/
#define BLOCK_SIZE 1024
void initList(List *l) {
l->list = malloc(sizeof(mpz_t) * BLOCK_SIZE);
if(!l->list) {
fprintf(stderr, "Failed to allocate memory to list!\n");
exit(1);
}
l->size = BLOCK_SIZE;
l->end = 0;
}
void deInitList(List *l) {
for(ulli i = 0; i < l->size; ++i) {
mpz_clear(l->list[i]);
}
free(l->list);
}
void addToList(List *l, mpz_t n) {
if(l->end == l->size) {
l->size += BLOCK_SIZE;
if(l->size == 0) {
fprintf(stderr, "`l->size' has overflowed!\n");
exit(1);
}
void *tmp = realloc(l->list, sizeof(mpz_t) * l->size);
if(!tmp) {
fprintf(stderr, "Failed to allocate more memory to list!\n");
exit(1);
}
l->list = (mpz_t*)tmp;
}
mpz_init(l->list[l->end]);
mpz_set(l->list[l->end++], n);
}

38
src/list.h Normal file
View File

@ -0,0 +1,38 @@
#pragma once
#include <gmp.h>
#include <stdbool.h>
#include "types.h"
/**
* @brief An infinitely expanding list type.
*/
typedef struct {
mpz_t *list; //!< The list of elements
ulli size; //!< How many elements are in the list
ulli end; //!< The last element of the list (in use)
} List;
/**
* @brief Initialize a List.
* @details Initialize the list and its variables, allocating memory
* to the pointer array inside. Returns true on success and false on
* failure.
* @param[in] l A pointer to a List type to be initialized.
*/
void initList(List *l);
/**
* @brief Deinitialize a List.
* @details Release all memory that has been allocated to the list.
* @param[in] l A pointer to a List type to be deinitialized.
*/
void deInitList(List *l);
/**
* @brief Adds a new item to a List type.
* @details Add item `n' at the end of a List type.
* @param[out] l List to which the variable should be appended.
* @param[in] n variable to be appended to the list.
*/
void addToList(List *l, mpz_t n);

77
src/main.c Normal file
View File

@ -0,0 +1,77 @@
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
#include <stdbool.h>
#include <gmp.h>
#include "list.h"
#include "types.h"
static bool run;
void leave();
int main(void) {
puts("Indivisible v0.2\n");
// Quit on ^C by setting `run = false'
run = true;
signal(SIGINT, leave);
// Primes we've found
List primes;
initList(&primes);
// The number we're going to be testing for
mpz_t num;
mpz_init(num);
// Add 2, a known prime to this list
mpz_set_ui(num, 2);
addToList(&primes, num);
if(mpz_out_str(stdout, 10, num) == 0) {
fprintf(stderr, "Could not print to `stdout'!\n");
exit(1);
}
printf("\n");
mpz_add_ui(num, num, 1);
// Variable for half `num'
mpz_t halfNum;
mpz_init(halfNum);
do {
// Calculate half of `num'
mpz_fdiv_q_ui(halfNum, num, 2);
// Loop through found primes
// Skip 2 because we're skipping even nymbers
for(ulli i = 1; mpz_cmp(primes.list[i], halfNum) >= 0; ++i) {
// If `num' is divisible by a prime then go to the next number
if(mpz_divisible_p(num, primes.list[i]) != 0)
goto nextPrime;
}
// `num' is a prime so we add it to the list and print it
addToList(&primes, num);
if(mpz_out_str(stdout, 10, num) == 0) {
fprintf(stderr, "Could not print to `stdout'!\n");
exit(1);
}
printf("\n");
nextPrime:
// Add 2 (skip even numbers since they're all divisible by 2)
mpz_add_ui(num, num, 2);
} while(run);
// Clear GMP variables
mpz_clear(halfNum);
mpz_clear(num);
// Deinitialize the list
deInitList(&primes);
return 0;
}
void leave() {
puts("Exiting...\n");
run = false;
}

2
src/types.h Normal file
View File

@ -0,0 +1,2 @@
#pragma once
typedef unsigned long long int ulli;